octave-nkf: libinterp/octave-value/ov-str-mat.cc annotate

annotate libinterp/octave-value/ov-str-mat.cc @ 20611:40ed9b46a800

new octave_value::string_value method with optional error message * ov.h (octave_value::string_vector): New method. ov-base.cc, ov-base.h (octave_base_value::string_vector): New default method. ov-str-mat.cc, ov-str-mat.h (octave_char_matrix_str::string_value): New method.

author	John W. Eaton <jwe@octave.org>
date	Thu, 08 Oct 2015 16:43:22 -0400
parents	f90c8372b7ba
children

rev	line source
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1 /*
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2
19731 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19632 diff changeset	3 Copyright (C) 1996-2015 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11265 diff changeset	4 Copyright (C) 2009-2010 VZLU Prague
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	5
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	7
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	11 option) any later version.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	12
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	16 for more details.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	17
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	20 <http://www.gnu.org/licenses/>.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	21
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	22 */
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	23
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25 #include <config.h>
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	26 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	27
7528 26d8a92644de try to avoid ctype macro problems John W. Eaton <jwe@octave.org> parents: 7503 diff changeset	28 #include <cctype>
26d8a92644de try to avoid ctype macro problems John W. Eaton <jwe@octave.org> parents: 7503 diff changeset	29
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3221 diff changeset	30 #include <iostream>
4726 14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe] jwe parents: 4687 diff changeset	31 #include <vector>
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	32
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	33 #include "data-conv.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	34 #include "lo-ieee.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	35 #include "mach-info.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	36 #include "mx-base.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	37 #include "oct-locbuf.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	38
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	39 #include "byte-swap.h"
5758 65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	40 #include "defun.h"
65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	41 #include "gripes.h"
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	42 #include "ls-ascii-helper.h"
e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	43 #include "ls-hdf5.h"
20482 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20253 diff changeset	44 #include "ls-oct-text.h"
5758 65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	45 #include "ls-utils.h"
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	46 #include "oct-obj.h"
19897 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: 19731 diff changeset	47 #include "oct-hdf5.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	48 #include "oct-stream.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	49 #include "ops.h"
5033 3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	50 #include "ov-scalar.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	51 #include "ov-re-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	52 #include "ov-str-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	53 #include "pr-output.h"
3836 b8c1cb5b9fd9 [project @ 2001-05-31 19:30:49 by jwe] jwe parents: 3536 diff changeset	54 #include "pt-mat.h"
5758 65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	55 #include "utils.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	56
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	57
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4513 diff changeset	58 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_char_matrix_str, "string", "char");
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	59 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_char_matrix_sq_str, "sq_string",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	60 "char");
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	61
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	62 static octave_base_value *
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	63 default_numeric_conversion_function (const octave_base_value& a)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	64 {
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	65 octave_base_value *retval = 0;
5033 3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	66
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	67 CAST_CONV_ARG (const octave_char_matrix_str&);
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	68
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	69 NDArray nda = v.array_value (true);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3136 diff changeset	70
20587 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	71 if (nda.numel () == 1)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	72 retval = new octave_scalar (nda(0));
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	73 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	74 retval = new octave_matrix (nda);
5033 3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	75
3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	76 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	77 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	78
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8168 diff changeset	79 octave_base_value::type_conv_info
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	80 octave_char_matrix_str::numeric_conversion_function (void) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	81 {
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8168 diff changeset	82 return octave_base_value::type_conv_info (default_numeric_conversion_function,
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8168 diff changeset	83 octave_matrix::static_type_id ());
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	84 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	85
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	86 octave_value
5400 c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe] jwe parents: 5307 diff changeset	87 octave_char_matrix_str::do_index_op_internal (const octave_value_list& idx,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	88 bool resize_ok, char type)
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	89 {
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	90 octave_value retval;
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	91
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	92 octave_idx_type len = idx.length ();
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	93
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	94 // If we catch an indexing error in index_vector, we flag an error in
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	95 // index k. Ensure it is the right value befor each idx_vector call.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	96 // Same variable as used in the for loop in the default case.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	97
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	98 octave_idx_type k = 0;
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	99
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	100 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	101 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	102 switch (len)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	103 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	104 case 0:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	105 retval = octave_value (matrix, type);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	106 break;
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	107
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	108 case 1:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	109 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	110 idx_vector i = idx (0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	111
20587 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	112 retval = octave_value (charNDArray (matrix.index (i, resize_ok)),
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	113 type);
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	114 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	115 break;
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	116
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	117 case 2:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	118 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	119 idx_vector i = idx (0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	120 k = 1;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	121 idx_vector j = idx (1).index_vector ();
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	122
20587 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	123 retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)),
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	124 type);
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	125 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	126 break;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	127
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	128 default:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	129 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	130 Array<idx_vector> idx_vec (dim_vector (len, 1));
5435 66ad03c58880 [project @ 2005-08-31 20:41:47 by jwe] jwe parents: 5400 diff changeset	131
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	132 for (k = 0; k < len; k++)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	133 idx_vec(k) = idx(k).index_vector ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	134
20587 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	135 retval =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	136 octave_value (charNDArray (matrix.index (idx_vec, resize_ok)),
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	137 type);
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	138 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	139 break;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	140 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	141 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	142 catch (index_exception& e)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	143 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	144 // Rethrow to allow more info to be reported later.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	145 e.set_pos_if_unset (len, k+1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20484 diff changeset	146 throw;
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	147 }
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	148
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	149 return retval;
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	150 }
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	151
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	152 octave_value
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	153 octave_char_matrix_str::resize (const dim_vector& dv, bool fill) const
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	154 {
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	155 charNDArray retval (matrix);
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	156 if (fill)
14616 13cc11418393 improve handling of default resize fill value for arrays John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	157 retval.resize (dv, 0);
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	158 else
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	159 retval.resize (dv);
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9071 diff changeset	160 return octave_value (retval, is_sq_string () ? '\'' : '"');
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	161 }
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	162
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	163 #define CHAR_MATRIX_CONV(T, INIT, TNAME, FCN) \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	164 T retval INIT; \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	165 \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	166 if (! force_string_conv) \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	167 gripe_invalid_conversion ("string", TNAME); \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	168 else \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	169 { \
5878 27771d9cd4f4 [project @ 2006-07-02 18:45:11 by jwe] jwe parents: 5828 diff changeset	170 warning_with_id ("Octave:str-to-num", \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	171 "implicit conversion from %s to %s", \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	172 "string", TNAME); \
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	173 \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	174 retval = octave_char_matrix::FCN (); \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	175 } \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	176 \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	177 return retval
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	178
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	179 double
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	180 octave_char_matrix_str::double_value (bool force_string_conv) const
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	181 {
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	182 CHAR_MATRIX_CONV (double, = 0, "real scalar", double_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	183 }
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	184
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	185 Complex
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	186 octave_char_matrix_str::complex_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	187 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	188 CHAR_MATRIX_CONV (Complex, = 0, "complex scalar", complex_value);
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	189 }
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	190
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	191 Matrix
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	192 octave_char_matrix_str::matrix_value (bool force_string_conv) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	193 {
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	194 CHAR_MATRIX_CONV (Matrix, , "real matrix", matrix_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	195 }
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	196
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	197 ComplexMatrix
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	198 octave_char_matrix_str::complex_matrix_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	199 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	200 CHAR_MATRIX_CONV (ComplexMatrix, , "complex matrix", complex_matrix_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	201 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	202
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	203 NDArray
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	204 octave_char_matrix_str::array_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	205 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	206 CHAR_MATRIX_CONV (NDArray, , "real N-d array", array_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	207 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	208
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	209 ComplexNDArray
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	210 octave_char_matrix_str::complex_array_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	211 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	212 CHAR_MATRIX_CONV (ComplexNDArray, , "complex N-d array",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	213 complex_array_value);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	214 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	215
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	216 string_vector
5715 edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe] jwe parents: 5707 diff changeset	217 octave_char_matrix_str::all_strings (bool) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	218 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	219 string_vector retval;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	220
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	221 if (matrix.ndims () == 2)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	222 {
19350 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 18099 diff changeset	223 charMatrix chm (matrix);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	224
6816 ec4c1dfb985a [project @ 2007-08-15 04:45:39 by jwe] jwe parents: 6815 diff changeset	225 octave_idx_type n = chm.rows ();
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	226
6816 ec4c1dfb985a [project @ 2007-08-15 04:45:39 by jwe] jwe parents: 6815 diff changeset	227 retval.resize (n);
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	228
6816 ec4c1dfb985a [project @ 2007-08-15 04:45:39 by jwe] jwe parents: 6815 diff changeset	229 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	230 retval[i] = chm.row_as_string (i);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	231 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	232 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	233 error ("invalid conversion of charNDArray to string_vector");
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	234
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	235 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	236 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	237
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	238 std::string
4457 d7d9ca19960a [project @ 2003-07-11 03:05:38 by jwe] jwe parents: 4452 diff changeset	239 octave_char_matrix_str::string_value (bool) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	240 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	241 std::string retval;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	242
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	243 if (matrix.ndims () == 2)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	244 {
19350 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 18099 diff changeset	245 charMatrix chm (matrix);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	246
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17825 diff changeset	247 retval = chm.row_as_string (0); // FIXME?
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	248 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	249 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	250 error ("invalid conversion of charNDArray to string");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	251
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	252 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	253 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	254
20611 40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	255 std::string
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	256 octave_char_matrix_str::string_value (const char *fmt, va_list args) const
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	257 {
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	258 std::string retval;
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	259
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	260 if (! fmt)
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	261 return string_value ();
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	262
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	263 bool conversion_error = false;
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	264
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	265 if (matrix.ndims () == 2)
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	266 {
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	267 charMatrix chm (matrix);
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	268
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	269 try
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	270 {
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	271 retval = chm.row_as_string (0); // FIXME?
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	272 }
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	273 catch (const octave_execution_exception&)
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	274 {
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	275 conversion_error = true;
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	276 }
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	277 }
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	278 else
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	279 conversion_error = true;
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	280
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	281 if (conversion_error)
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	282 verror (fmt, args);
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	283
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	284 return retval;
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	285 }
40ed9b46a800 new octave_value::string_value method with optional error message John W. Eaton <jwe@octave.org> parents: 20587 diff changeset	286
10729 172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	287 Array<std::string>
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	288 octave_char_matrix_str::cellstr_value (void) const
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	289 {
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	290 Array<std::string> retval;
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	291
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	292 if (matrix.ndims () == 2)
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	293 {
19350 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 18099 diff changeset	294 const charMatrix chm (matrix);
10729 172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	295 octave_idx_type nr = chm.rows ();
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	296 retval.clear (nr, 1);
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	297 for (octave_idx_type i = 0; i < nr; i++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	298 retval.xelem (i) = chm.row_as_string (i);
10729 172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	299 }
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	300 else
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	301 error ("cellstr: cannot convert multidimensional arrays");
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	302
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	303 return retval;
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	304 }
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	305
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	306 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	307 octave_char_matrix_str::print_raw (std::ostream& os,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	308 bool pr_as_read_syntax) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	309 {
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3203 diff changeset	310 octave_print_internal (os, matrix, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	311 current_print_indent_level (), true);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	312 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	313
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	314 void
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	315 octave_char_matrix_str::short_disp (std::ostream& os) const
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	316 {
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	317 if (matrix.ndims () == 2 && numel () > 0)
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	318 {
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	319 std::string tmp = string_value ();
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	320
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17825 diff changeset	321 // FIXME: should this be configurable?
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	322 size_t max_len = 100;
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	323
17876 b951a8351fd7 Fix display of char arrays in GUI Variable window. Rik <rik@octave.org> parents: 17870 diff changeset	324 os << (tmp.length () > max_len ? tmp.substr (0, 100) : tmp);
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	325 }
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	326 }
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	327
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	328 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6816 diff changeset	329 octave_char_matrix_str::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	330 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	331 dim_vector d = dims ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	332 if (d.length () > 2)
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	333 {
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	334 charNDArray tmp = char_array_value ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	335 os << "# ndims: " << d.length () << "\n";
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	336 for (int i=0; i < d.length (); i++)
20253 b2100e1659ac maint: Use cuddled parentheses when indexing dimension_vectors. Rik <rik@octave.org> parents: 19897 diff changeset	337 os << " " << d(i);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	338 os << "\n";
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	339 os.write (tmp.fortran_vec (), d.numel ());
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	340 os << "\n";
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	341 }
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	342 else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	343 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	344 // Keep this case, rather than use generic code above for
20484 df4165dfc676 maint: Fix misspelled word compatibility in code comments. Rik <rik@octave.org> parents: 20482 diff changeset	345 // backward compatibility. Makes load_ascii much more complex!!
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	346 charMatrix chm = char_matrix_value ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	347 octave_idx_type elements = chm.rows ();
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	348 os << "# elements: " << elements << "\n";
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	349 for (octave_idx_type i = 0; i < elements; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	350 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	351 unsigned len = chm.cols ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	352 os << "# length: " << len << "\n";
11265 a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10729 diff changeset	353 std::string tstr = chm.row_as_string (i);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	354 const char *tmp = tstr.data ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	355 if (tstr.length () > len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	356 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	357 os.write (tmp, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	358 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	359 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	360 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	361
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	362 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	363 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	364
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	365 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	366 octave_char_matrix_str::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	367 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	368 bool success = true;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	369
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	370 string_vector keywords(3);
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	371
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	372 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	373 keywords[1] = "elements";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	374 keywords[2] = "length";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	375
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	376 std::string kw;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	377 int val = 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	378
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	379 if (extract_keyword (is, keywords, kw, val, true))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	380 {
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	381 if (kw == "ndims")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	382 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	383 int mdims = val;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	384
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	385 if (mdims >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	386 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	387 dim_vector dv;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	388 dv.resize (mdims);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	389
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	390 for (int i = 0; i < mdims; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	391 is >> dv(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	392
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	393 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	394 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	395 charNDArray tmp(dv);
6717 b319df52ba87 [project @ 2007-06-13 20:25:53 by jwe] jwe parents: 6151 diff changeset	396
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	397 if (tmp.is_empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	398 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	399 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	400 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	401 char *ftmp = tmp.fortran_vec ();
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	402
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	403 skip_preceeding_newline (is);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	404
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	405 if (! is.read (ftmp, dv.numel ()) \|\| !is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	406 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	407 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	408 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	409 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	410 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	411 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	412 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	413 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	414 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	415 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	416 error ("load: failed to read dimensions");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	417 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	418 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	419 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	420 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	421 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	422 error ("load: failed to extract matrix size");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	423 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	424 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	425 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	426 else if (kw == "elements")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	427 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	428 int elements = val;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	429
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	430 if (elements >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	431 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	432 // FIXME: need to be able to get max length before doing anything.
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	433
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	434 charMatrix chm (elements, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	435 int max_len = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	436 for (int i = 0; i < elements; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	437 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	438 int len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	439 if (extract_keyword (is, "length", len) && len >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	440 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	441 // Use this instead of a C-style character
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	442 // buffer so that we can properly handle
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	443 // embedded NUL characters.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	444 charMatrix tmp (1, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	445 char *ptmp = tmp.fortran_vec ();
6151 12c50a17f20f [project @ 2006-11-10 17:34:45 by jwe] jwe parents: 5958 diff changeset	446
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	447 if (len > 0 && ! is.read (ptmp, len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	448 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	449 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	450 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	451 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	452 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	453 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	454 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	455 if (len > max_len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	456 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	457 max_len = len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	458 chm.resize (elements, max_len, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	459 }
6151 12c50a17f20f [project @ 2006-11-10 17:34:45 by jwe] jwe parents: 5958 diff changeset	460
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	461 chm.insert (tmp, i, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	462 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	463 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	464 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	465 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	466 error ("load: failed to extract string length for element %d",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	467 i+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	468 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	469 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	470 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	471
20587 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	472 matrix = chm;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	473 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	474 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	475 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	476 error ("load: failed to extract number of string elements");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	477 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	478 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	479 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	480 else if (kw == "length")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	481 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	482 int len = val;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	483
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	484 if (len >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	485 {
20484 df4165dfc676 maint: Fix misspelled word compatibility in code comments. Rik <rik@octave.org> parents: 20482 diff changeset	486 // This is cruft for backward compatibility,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	487 // but relatively harmless.
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	488
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	489 // Use this instead of a C-style character buffer so
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	490 // that we can properly handle embedded NUL characters.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	491 charMatrix tmp (1, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	492 char *ptmp = tmp.fortran_vec ();
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	493
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	494 if (len > 0 && ! is.read (ptmp, len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	495 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	496 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	497 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	498 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	499 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	500 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	501 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	502 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	503 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	504 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	505 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	506 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	507 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	508 panic_impossible ();
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	509 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	510 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	511 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	512 error ("load: failed to extract number of rows and columns");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	513 success = false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	514 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	515
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	516 return success;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	517 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	518
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	519 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	520 octave_char_matrix_str::save_binary (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	521 bool& /* save_as_floats */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	522 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	523 dim_vector d = dims ();
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14616 diff changeset	524 if (d.length () < 1)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	525 return false;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	526
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	527 // Use negative value for ndims to differentiate with old format!!
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14616 diff changeset	528 int32_t tmp = - d.length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	529 os.write (reinterpret_cast<char *> (&tmp), 4);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	530 for (int i=0; i < d.length (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	531 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	532 tmp = d(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	533 os.write (reinterpret_cast<char *> (&tmp), 4);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	534 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	535
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	536 charNDArray m = char_array_value ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	537 os.write (m.fortran_vec (), d.numel ());
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	538 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	539 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	540
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	541 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	542 octave_char_matrix_str::load_binary (std::istream& is, bool swap,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	543 oct_mach_info::float_format /* fmt */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	544 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	545 int32_t elements;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	546 if (! is.read (reinterpret_cast<char *> (&elements), 4))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	547 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	548 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	549 swap_bytes<4> (&elements);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	550
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	551 if (elements < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	552 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	553 int32_t mdims = - elements;
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	554 int32_t di;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	555 dim_vector dv;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	556 dv.resize (mdims);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	557
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	558 for (int i = 0; i < mdims; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	559 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	560 if (! is.read (reinterpret_cast<char *> (&di), 4))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	561 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	562 if (swap)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	563 swap_bytes<4> (&di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	564 dv(i) = di;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	565 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	566
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	567 // 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	568 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	569 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	570
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	571 if (mdims == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	572 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	573 mdims = 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	574 dv.resize (mdims);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	575 dv(1) = dv(0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	576 dv(0) = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	577 }
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	578
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	579 charNDArray m(dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	580 char *tmp = m.fortran_vec ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	581 is.read (tmp, dv.numel ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	582
20587 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	583 if (! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	584 return false;
20587 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20574 diff changeset	585
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	586 matrix = m;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	587 }
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	588 else
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	589 {
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	590 charMatrix chm (elements, 0);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	591 int max_len = 0;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	592 for (int i = 0; i < elements; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	593 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	594 int32_t len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	595 if (! is.read (reinterpret_cast<char *> (&len), 4))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	596 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	597 if (swap)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	598 swap_bytes<4> (&len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	599 charMatrix btmp (1, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	600 char *pbtmp = btmp.fortran_vec ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	601 if (! is.read (pbtmp, len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	602 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	603 if (len > max_len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	604 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	605 max_len = len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	606 chm.resize (elements, max_len, 0);
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 chm.insert (btmp, i, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	609 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	610 matrix = chm;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	611 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	612 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	613 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	614
19897 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: 19731 diff changeset	615 bool
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: 19731 diff changeset	616 octave_char_matrix_str::save_hdf5 (octave_hdf5_id loc_id, const char *name,
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: 19731 diff changeset	617 bool /* save_as_floats */)
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: 19731 diff changeset	618 {
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: 19731 diff changeset	619 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: 19731 diff changeset	620
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	621 #if defined (HAVE_HDF5)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	622
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	623 dim_vector dv = dims ();
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	624 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	625 if (empty)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	626 return (empty > 0);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	627
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	628 int rank = dv.length ();
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17876 diff changeset	629 hid_t space_hid, data_hid;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17876 diff changeset	630 space_hid = data_hid = -1;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	631 charNDArray m = char_array_value ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	632
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	633 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	634
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	635 // Octave uses column-major, while HDF5 uses row-major ordering
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	636 for (int i = 0; i < rank; i++)
20253 b2100e1659ac maint: Use cuddled parentheses when indexing dimension_vectors. Rik <rik@octave.org> parents: 19897 diff changeset	637 hdims[i] = dv(rank-i-1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	638
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4805 diff changeset	639 space_hid = H5Screate_simple (rank, hdims, 0);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	640 if (space_hid < 0)
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	641 return false;
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	642 #if HAVE_HDF5_18
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	643 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	644 H5P_DEFAULT, H5P_DEFAULT, 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	645 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	646 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	647 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	648 #endif
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	649 if (data_hid < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	650 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	651 H5Sclose (space_hid);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	652 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	653 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	654
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	655 OCTAVE_LOCAL_BUFFER (char, s, dv.numel ());
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	656
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	657 for (int i = 0; i < dv.numel (); ++i)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	658 s[i] = m(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	659
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	660 retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	661 H5P_DEFAULT, s) >= 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	662
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	663 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	664 H5Sclose (space_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	665
19897 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: 19731 diff changeset	666 #else
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: 19731 diff changeset	667 gripe_save ("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: 19731 diff changeset	668 #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: 19731 diff changeset	669
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	670 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	671 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	672
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	673 bool
19897 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: 19731 diff changeset	674 octave_char_matrix_str::load_hdf5 (octave_hdf5_id loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	675 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	676 bool retval = false;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	677
19897 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: 19731 diff changeset	678 #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: 19731 diff changeset	679
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	680 dim_vector dv;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	681 int empty = load_hdf5_empty (loc_id, name, dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	682 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	683 matrix.resize (dv);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	684 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	685 return (empty > 0);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	686
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	687 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	688 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	689 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	690 hid_t data_hid = H5Dopen (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	691 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	692 hid_t space_hid = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	693 hsize_t rank = H5Sget_simple_extent_ndims (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	694 hid_t type_hid = H5Dget_type (data_hid);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	695 hid_t type_class_hid = H5Tget_class (type_hid);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	696
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	697 if (type_class_hid == H5T_INTEGER)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	698 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	699 if (rank < 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	700 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	701 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	702 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	703 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	704 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	705 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	706
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	707 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	708 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	709
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	710 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	711
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	712 // Octave uses column-major, while HDF5 uses row-major ordering
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	713 if (rank == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	714 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	715 dv.resize (2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	716 dv(0) = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	717 dv(1) = hdims[0];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	718 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	719 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	720 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	721 dv.resize (rank);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	722 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	723 dv(j) = hdims[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	724 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	725
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	726 charNDArray m (dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	727 char *str = m.fortran_vec ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	728 if (H5Dread (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	729 H5P_DEFAULT, str) >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	730 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	731 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	732 matrix = m;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	733 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	734
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	735 H5Tclose (type_hid);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	736 H5Sclose (space_hid);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	737 H5Dclose (data_hid);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	738 return true;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	739 }
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	740 else
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	741 {
20484 df4165dfc676 maint: Fix misspelled word compatibility in code comments. Rik <rik@octave.org> parents: 20482 diff changeset	742 // This is cruft for backward compatibility and easy data
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	743 // importation
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	744 if (rank == 0) //FIXME: Does rank==0 even exist for strings in HDF5?
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	745 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	746 // a single string:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	747 int slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	748 if (slen < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	749 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	750 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	751 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	752 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	753 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	754 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	755 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	756 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	757 OCTAVE_LOCAL_BUFFER (char, s, slen);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	758 // create datatype for (null-terminated) string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	759 // to read into:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	760 hid_t st_id = H5Tcopy (H5T_C_S1);
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	761 H5Tset_size (st_id, slen+1);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	762 if (H5Dread (data_hid, st_id, H5S_ALL,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	763 H5S_ALL, H5P_DEFAULT, s) < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	764 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	765 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	766 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	767 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	768 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	769 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	770 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	771
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	772 matrix = charMatrix (s);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	773
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	774 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	775 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	776 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	777 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	778 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	779 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	780 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	781 else if (rank == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	782 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	783 // string vector
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	784 hsize_t elements, maxdim;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	785 H5Sget_simple_extent_dims (space_hid, &elements, &maxdim);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	786 int slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	787 if (slen < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	788 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	789 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	790 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	791 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	792 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	793 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	794 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	795 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	796 // hdf5 string arrays store strings of all the
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	797 // same physical length (I think), which is
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	798 // slightly wasteful, but oh well.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	799
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	800 OCTAVE_LOCAL_BUFFER (char, s, elements * (slen+1));
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	801
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	802 // create datatype for (null-terminated) string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	803 // to read into:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	804 hid_t st_id = H5Tcopy (H5T_C_S1);
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	805 H5Tset_size (st_id, slen+1);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	806
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	807 if (H5Dread (data_hid, st_id, H5S_ALL,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	808 H5S_ALL, H5P_DEFAULT, s) < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	809 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	810 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	811 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	812 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	813 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	814 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	815 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	816
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	817 charMatrix chm (elements, slen, ' ');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	818 for (hsize_t i = 0; i < elements; ++i)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	819 {
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	820 chm.insert (s + i*(slen+1), i, 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	821 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	822
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	823 matrix = chm;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	824
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	825 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	826 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	827 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	828 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	829 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	830 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	831 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	832 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	833 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	834 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	835 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	836 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	837 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	838 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	839 }
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	840
19897 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: 19731 diff changeset	841 #else
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: 19731 diff changeset	842 gripe_load ("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: 19731 diff changeset	843 #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: 19731 diff changeset	844
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	845 return retval;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	846 }

Mercurial > octave-nkf

annotate libinterp/octave-value/ov-str-mat.cc @ 20611:40ed9b46a800