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

annotate libinterp/octave-value/ov-fcn-inline.cc @ 21211:2cf8bc5c7017

use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests * configure.ac (HAVE_HDF5_INT2FLOAT_CONVERSIONS): AC_DEFINE here. * ls-hdf5.cc (HAVE_HDF5_INT2FLOAT_CONVERSION): Delete definition. * ls-hdf5.cc, ls-hdf5.h, ccolamd.cc, dmperm.cc, ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, pt-eval.cc: Use #if defined (HAVE_FOO) instead of #if HAVE_FOO.

author	John W. Eaton <jwe@octave.org>
date	Sat, 06 Feb 2016 08:48:47 -0500
parents	fcac5dbbf9ed
children	40de9f8f23a6

rev	line source
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	1 /*
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19598 diff changeset	3 Copyright (C) 2004-2015 David Bateman
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	4
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	5 This file is part of Octave.
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	6
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	8 under the terms of the GNU General Public License as published by the
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	10 option) any later version.
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	11
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	15 for more details.
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	16
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	17 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: 7001 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	19 <http://www.gnu.org/licenses/>.
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	20
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	21 In addition to the terms of the GPL, you are permitted to link
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	22 this program with any Open Source program, as defined by the
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	23 Open Source Initiative (www.opensource.org)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	24
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	25 */
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	26
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	27 #ifdef HAVE_CONFIG_H
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21102 diff changeset	28 # include <config.h>
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	29 #endif
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	30
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	31 #include <istream>
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	32 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	33 #include <sstream>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5105 diff changeset	34 #include <vector>
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	35
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8045 diff changeset	36 #include "oct-locbuf.h"
25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8045 diff changeset	37
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	38 #include "defun.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	39 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21022 diff changeset	40 #include "errwarn.h"
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	41 #include "oct-hdf5.h"
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	42 #include "oct-map.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	43 #include "ov-base.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	44 #include "ov-fcn-inline.h"
8032 2fd4a5ef6b59 stash parent function scope for inline functions and anonymous function handles. John W. Eaton <jwe@octave.org> parents: 7908 diff changeset	45 #include "ov-usr-fcn.h"
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	46 #include "pr-output.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	47 #include "variables.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	48 #include "parse.h"
8032 2fd4a5ef6b59 stash parent function scope for inline functions and anonymous function handles. John W. Eaton <jwe@octave.org> parents: 7908 diff changeset	49 #include "toplev.h"
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	50
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	51 #include "byte-swap.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	52 #include "ls-ascii-helper.h"
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	53 #include "ls-oct-text.h"
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	54 #include "ls-hdf5.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	55 #include "ls-utils.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	56
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	57
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	58 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fcn_inline,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	59 "inline function",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	60 "function_handle");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	61
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	62 octave_fcn_inline::octave_fcn_inline (const std::string& f,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	63 const string_vector& a,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	64 const std::string& n)
5007 f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	65 : octave_fcn_handle (n), iftext (f), ifargs (a)
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	66 {
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	67 // Form a string representing the function.
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	68
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	69 std::ostringstream buf;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	70
5007 f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	71 buf << "@(";
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	72
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	73 for (int i = 0; i < ifargs.numel (); i++)
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	74 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	75 if (i > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	76 buf << ", ";
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	77
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	78 buf << ifargs(i);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	79 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	80
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	81 buf << ") " << iftext;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	82
5007 f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	83 int parse_status;
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	84 octave_value anon_fcn_handle = eval_string (buf.str (), true, parse_status);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	85
5007 f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	86 if (parse_status == 0)
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	87 {
5007 f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	88 octave_fcn_handle *fh = anon_fcn_handle.fcn_handle_value ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	89
5007 f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	90 if (fh)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	91 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	92 fcn = fh->fcn_val ();
8032 2fd4a5ef6b59 stash parent function scope for inline functions and anonymous function handles. John W. Eaton <jwe@octave.org> parents: 7908 diff changeset	93
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	94 octave_user_function *uf = fcn.user_function_value ();
8032 2fd4a5ef6b59 stash parent function scope for inline functions and anonymous function handles. John W. Eaton <jwe@octave.org> parents: 7908 diff changeset	95
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	96 if (uf)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	97 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	98 octave_function *curr_fcn = octave_call_stack::current ();
8045 24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	99
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	100 if (curr_fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	101 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	102 symbol_table::scope_id parent_scope
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	103 = curr_fcn->parent_fcn_scope ();
8045 24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	104
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	105 if (parent_scope < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	106 parent_scope = curr_fcn->scope ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	107
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	108 uf->stash_parent_fcn_scope (parent_scope);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	109 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	110 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	111 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	112 }
5007 f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	113
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe] jwe parents: 4988 diff changeset	114 if (fcn.is_undefined ())
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	115 error ("inline: unable to define function");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	116 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	117
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	118 // This function is supplied to allow a Matlab style class structure
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	119 // to be returned..
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	120 octave_map
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	121 octave_fcn_inline::map_value (void) const
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	122 {
11070 686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	123 octave_scalar_map m;
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	124
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	125 m.assign ("version", 1.0);
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	126 m.assign ("isEmpty", 0.0);
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	127 m.assign ("expr", fcn_text ());
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	128
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	129 string_vector args = fcn_arg_names ();
11070 686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	130
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	131 m.assign ("numArgs", args.numel ());
11070 686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	132 m.assign ("args", args);
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	133
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	134 std::ostringstream buf;
11070 686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	135
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	136 for (int i = 0; i < args.numel (); i++)
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	137 buf << args(i) << " = INLINE_INPUTS_{" << i + 1 << "}; ";
11070 686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	138
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	139 m.assign ("inputExpr", buf.str ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	140
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	141 return m;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	142 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	143
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	144 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6973 diff changeset	145 octave_fcn_inline::save_ascii (std::ostream& os)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	146 {
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	147 os << "# nargs: " << ifargs.numel () << "\n";
a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	148 for (int i = 0; i < ifargs.numel (); i++)
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	149 os << ifargs(i) << "\n";
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	150 if (nm.length () < 1)
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	151 // Write an invalid value to flag empty fcn handle name.
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	152 os << "0\n";
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	153 else
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	154 os << nm << "\n";
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	155 os << iftext << "\n";
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	156 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	157 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	158
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	159 bool
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	160 octave_fcn_inline::load_ascii (std::istream& is)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	161 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	162 int nargs;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	163 if (extract_keyword (is, "nargs", nargs, true))
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	164 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	165 ifargs.resize (nargs);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	166 for (int i = 0; i < nargs; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	167 is >> ifargs(i);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	168 is >> nm;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	169 if (nm == "0")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	170 nm = "";
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	171
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	172 skip_preceeding_newline (is);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	173
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	174 std::string buf;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	175
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	176 if (is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	177 {
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	178
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	179 // Get a line of text whitespace characters included,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	180 // leaving newline in the stream.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	181 buf = read_until_newline (is, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	182 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	183
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	184 iftext = buf;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	185
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	186 octave_fcn_inline tmp (iftext, ifargs, nm);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	187 fcn = tmp.fcn;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	188
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	189 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	190 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	191 else
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	192 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	193 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	194
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	195 bool
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	196 octave_fcn_inline::save_binary (std::ostream& os, bool&)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	197 {
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	198 int32_t tmp = ifargs.numel ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	199 os.write (reinterpret_cast<char *> (&tmp), 4);
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	200 for (int i = 0; i < ifargs.numel (); i++)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	201 {
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	202 tmp = ifargs(i).length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	203 os.write (reinterpret_cast<char *> (&tmp), 4);
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	204 os.write (ifargs(i).c_str (), ifargs(i).length ());
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	205 }
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	206 tmp = nm.length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	207 os.write (reinterpret_cast<char *> (&tmp), 4);
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	208 os.write (nm.c_str (), nm.length ());
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	209 tmp = iftext.length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	210 os.write (reinterpret_cast<char *> (&tmp), 4);
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	211 os.write (iftext.c_str (), iftext.length ());
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	212 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	213 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	214
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	215 bool
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	216 octave_fcn_inline::load_binary (std::istream& is, bool swap,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	217 oct_mach_info::float_format)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	218 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	219 int32_t nargs;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	220 if (! is.read (reinterpret_cast<char *> (&nargs), 4))
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	221 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	222 if (swap)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	223 swap_bytes<4> (&nargs);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	224
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	225 if (nargs < 1)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	226 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	227 else
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	228 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	229 int32_t tmp;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	230 ifargs.resize (nargs);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	231 for (int i = 0; i < nargs; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	232 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	233 if (! is.read (reinterpret_cast<char *> (&tmp), 4))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	234 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	235 if (swap)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	236 swap_bytes<4> (&tmp);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	237
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	238 OCTAVE_LOCAL_BUFFER (char, ctmp, tmp+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	239 is.read (ctmp, tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	240 ifargs(i) = std::string (ctmp);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	241
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	242 if (! is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	243 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	244 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	245
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	246 if (! is.read (reinterpret_cast<char *> (&tmp), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	247 return false;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	248 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	249 swap_bytes<4> (&tmp);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	250
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	251 OCTAVE_LOCAL_BUFFER (char, ctmp1, tmp+1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	252 is.read (ctmp1, tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	253 nm = std::string (ctmp1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	254
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	255 if (! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	256 return false;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	257
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	258 if (! is.read (reinterpret_cast<char *> (&tmp), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	259 return false;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	260 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	261 swap_bytes<4> (&tmp);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	262
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	263 OCTAVE_LOCAL_BUFFER (char, ctmp2, tmp+1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	264 is.read (ctmp2, tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	265 iftext = std::string (ctmp2);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	266
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	267 if (! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	268 return false;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	269
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	270 octave_fcn_inline ftmp (iftext, ifargs, nm);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	271 fcn = ftmp.fcn;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	272 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	273 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	274 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	275
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	276 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	277 octave_fcn_inline::save_hdf5 (octave_hdf5_id loc_id, const char *name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	278 bool /* save_as_floats */)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	279 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	280 bool retval = false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	281
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	282 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	283
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	284 hid_t group_hid = -1;
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	285
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	286 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	287 group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	288 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	289 group_hid = H5Gcreate (loc_id, name, 0);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	290 #endif
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18537 diff changeset	291 if (group_hid < 0) return false;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	292
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	293 size_t len = 0;
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	294 for (int i = 0; i < ifargs.numel (); i++)
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	295 if (len < ifargs(i).length ())
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	296 len = ifargs(i).length ();
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	297
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	298 hid_t space_hid, data_hid, type_hid;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	299 space_hid = data_hid = type_hid = -1;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	300
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17787 diff changeset	301 // FIXME: Is there a better way of saving string vectors,
870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17787 diff changeset	302 // than a null padded matrix?
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	303
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	304 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	305
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	306 // Octave uses column-major, while HDF5 uses row-major ordering
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	307 hdims[1] = ifargs.numel ();
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	308 hdims[0] = len + 1;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	309
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	310 space_hid = H5Screate_simple (2, hdims, 0);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	311 if (space_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	312 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	313 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	314 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	315 }
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	316 #if defined (HAVE_HDF5_18)
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	317 data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	318 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	319 #else
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	320 data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	321 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	322 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	323 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	324 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	325 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	326 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	327 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	328 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	329
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	330 OCTAVE_LOCAL_BUFFER (char, s, ifargs.numel () * (len + 1));
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	331
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	332 // Save the args as a null teminated list
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	333 for (int i = 0; i < ifargs.numel (); i++)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	334 {
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	335 const char * cptr = ifargs(i).c_str ();
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	336 for (size_t j = 0; j < ifargs(i).length (); j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	337 s[i(len+1)+j] = cptr++;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	338 s[ifargs(i).length ()] = '\0';
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	339 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	340
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	341 retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	342 octave_H5P_DEFAULT, s) >= 0;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	343
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	344 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	345 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	346
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20939 diff changeset	347 if (! retval)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	348 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	349 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	350 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	351 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	352
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	353 // attach the type of the variable
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	354 type_hid = H5Tcopy (H5T_C_S1);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	355 H5Tset_size (type_hid, nm.length () + 1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	356 if (type_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	357 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	358 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	359 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	360 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	361
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	362 hdims[0] = 0;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	363 space_hid = H5Screate_simple (0 , hdims, 0);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	364 if (space_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	365 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	366 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	367 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	368 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	369 }
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	370 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	371 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	372 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	373 #else
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	374 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	375 #endif
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	376 if (data_hid < 0 \|\| H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	377 octave_H5P_DEFAULT, nm.c_str ()) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	378 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	379 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	380 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	381 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	382 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	383 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	384 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	385
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	386 // attach the type of the variable
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	387 H5Tset_size (type_hid, iftext.length () + 1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	388 if (type_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	389 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	390 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	391 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	392 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	393
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	394 #if defined (HAVE_HDF5_18)
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	395 data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	396 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	397 #else
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	398 data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	399 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	400 #endif
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	401 if (data_hid < 0 \|\| H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	402 octave_H5P_DEFAULT, iftext.c_str ()) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	403 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	404 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	405 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	406 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	407 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	408 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	409
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	410 H5Dclose (data_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	411 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	412 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	413 H5Gclose (group_hid);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	414
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	415 #else
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	416 warn_save ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	417 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	418
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	419 return retval;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	420 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	421
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	422 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	423 octave_fcn_inline::load_hdf5 (octave_hdf5_id loc_id, const char *name)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	424 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	425 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	426
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	427 hid_t group_hid, data_hid, space_hid, type_hid, type_class_hid, st_id;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	428 hsize_t rank;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	429 int slen;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	430
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	431 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	432 group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	433 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	434 group_hid = H5Gopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	435 #endif
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18537 diff changeset	436 if (group_hid < 0) return false;
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	437
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	438 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	439 data_hid = H5Dopen (group_hid, "args", octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	440 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	441 data_hid = H5Dopen (group_hid, "args");
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	442 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	443 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	444 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	445
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	446 if (rank != 2)
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	447 {
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	448 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	449 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	450 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	451 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	452 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	453
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	454 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	455 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	456
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	457 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	458
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	459 ifargs.resize (hdims[1]);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	460
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	461 OCTAVE_LOCAL_BUFFER (char, s1, hdims[0] * hdims[1]);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	462
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	463 if (H5Dread (data_hid, H5T_NATIVE_UCHAR, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	464 octave_H5P_DEFAULT, s1) < 0)
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	465 {
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	466 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	467 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	468 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	469 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	470 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	471
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	472 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	473 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	474
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	475 for (size_t i = 0; i < hdims[1]; i++)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	476 ifargs(i) = std::string (s1 + i*hdims[0]);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	477
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	478 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	479 data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	480 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	481 data_hid = H5Dopen (group_hid, "nm");
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	482 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	483
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	484 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	485 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	486 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	487 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	488 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	489
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	490 type_hid = H5Dget_type (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	491 type_class_hid = H5Tget_class (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	492
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	493 if (type_class_hid != H5T_STRING)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	494 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	495 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	496 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	497 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	498 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	499 }
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	500
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	501 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	502 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	503
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	504 if (rank != 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	505 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	506 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	507 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	508 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	509 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	510 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	511 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	512
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	513 slen = H5Tget_size (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	514 if (slen < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	515 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	516 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	517 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	518 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	519 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	520 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	521 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	522
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	523 OCTAVE_LOCAL_BUFFER (char, nm_tmp, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	524
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	525 // create datatype for (null-terminated) string to read into:
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	526 st_id = H5Tcopy (H5T_C_S1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	527 H5Tset_size (st_id, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	528
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	529 if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, nm_tmp) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	530 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	531 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	532 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	533 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	534 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	535 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	536 H5Tclose (st_id);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	537 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	538 nm = nm_tmp;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	539
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	540 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	541 data_hid = H5Dopen (group_hid, "iftext", octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	542 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	543 data_hid = H5Dopen (group_hid, "iftext");
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	544 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	545
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	546 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	547 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	548 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	549 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	550 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	551
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	552 type_hid = H5Dget_type (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	553 type_class_hid = H5Tget_class (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	554
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	555 if (type_class_hid != H5T_STRING)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	556 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	557 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	558 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	559 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	560 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	561 }
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	562
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	563 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	564 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	565
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	566 if (rank != 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	567 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	568 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	569 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	570 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	571 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	572 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	573 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	574
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	575 slen = H5Tget_size (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	576 if (slen < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	577 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	578 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	579 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	580 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	581 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	582 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	583 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	584
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	585 OCTAVE_LOCAL_BUFFER (char, iftext_tmp, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	586
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	587 // create datatype for (null-terminated) string to read into:
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	588 st_id = H5Tcopy (H5T_C_S1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	589 H5Tset_size (st_id, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	590
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	591 if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, iftext_tmp) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	592 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	593 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	594 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	595 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	596 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	597 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	598 H5Tclose (st_id);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	599 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	600 iftext = iftext_tmp;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	601
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	602 octave_fcn_inline ftmp (iftext, ifargs, nm);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	603 fcn = ftmp.fcn;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	604
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	605 return true;
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	606
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	607 #else
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	608 warn_load ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	609 return false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	610 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	611 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	612
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	613 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18100 diff changeset	614 octave_fcn_inline::print (std::ostream& os, bool pr_as_read_syntax)
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	615 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	616 print_raw (os, pr_as_read_syntax);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	617 newline (os);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	618 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	619
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	620 void
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	621 octave_fcn_inline::print_raw (std::ostream& os, bool pr_as_read_syntax) const
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	622 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	623 std::ostringstream buf;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	624
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	625 if (nm.empty ())
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	626 buf << "f(";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	627 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	628 buf << nm << "(";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	629
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	630 for (int i = 0; i < ifargs.numel (); i++)
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	631 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	632 if (i)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	633 buf << ", ";
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	634
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	635 buf << ifargs(i);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	636 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	637
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	638 buf << ") = " << iftext;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	639
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	640 octave_print_internal (os, buf.str (), pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	641 current_print_indent_level ());
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	642 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	643
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	644 octave_value
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5164 diff changeset	645 octave_fcn_inline::convert_to_str_internal (bool, bool, char type) const
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	646 {
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5164 diff changeset	647 return octave_value (fcn_text (), type);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	648 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	649
6973 6fcc2f5b2c7d [project @ 2007-10-08 10:22:17 by jwe] jwe parents: 6635 diff changeset	650 DEFUNX ("inline", Finline, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	651 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20818 diff changeset	652 @deftypefn {} {} inline (@var{str})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20818 diff changeset	653 @deftypefnx {} {} inline (@var{str}, @var{arg1}, @dots{})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20818 diff changeset	654 @deftypefnx {} {} inline (@var{str}, @var{n})\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	655 Create an inline function from the character string @var{str}.\n\
18533 ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17861 diff changeset	656 \n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	657 If called with a single argument, the arguments of the generated function\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	658 are extracted from the function itself. The generated function arguments\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	659 will then be in alphabetical order. It should be noted that i and j are\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	660 ignored as arguments due to the ambiguity between their use as a variable or\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	661 their use as an built-in constant. All arguments followed by a parenthesis\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	662 are considered to be functions. If no arguments are found, a function\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	663 taking a single argument named @code{x} will be created.\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	664 \n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	665 If the second and subsequent arguments are character strings, they are the\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	666 names of the arguments of the function.\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	667 \n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	668 If the second argument is an integer @var{n}, the arguments are\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 16816 diff changeset	669 @qcode{\"x\"}, @qcode{\"P1\"}, @dots{}, @qcode{\"P@var{N}\"}.\n\
18533 ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17861 diff changeset	670 \n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17861 diff changeset	671 Programming Note: The use of @code{inline} is discouraged and it may be\n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17861 diff changeset	672 removed from a future version of Octave. The preferred way to create\n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17861 diff changeset	673 functions from strings is through the use of anonymous functions\n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17861 diff changeset	674 (@pxref{Anonymous Functions}) or @code{str2func}.\n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17861 diff changeset	675 @seealso{argnames, formula, vectorize, str2func}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	676 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	677 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	678 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	679
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	680 if (nargin == 0)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	681 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	682
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	683 std::string fun = args(0).xstring_value ("inline: STR argument must be a string");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	684
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	685 string_vector fargs;
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	686
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	687 if (nargin == 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	688 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	689 bool is_arg = false;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	690 bool in_string = false;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	691 std::string tmp_arg;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	692 size_t i = 0;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	693 size_t fun_length = fun.length ();
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	694
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	695 while (i < fun_length)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	696 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	697 bool terminate_arg = false;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	698 char c = fun[i++];
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	699
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	700 if (in_string)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	701 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	702 if (c == '\'' \|\| c == '\"')
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	703 in_string = false;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	704 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	705 else if (c == '\'' \|\| c == '\"')
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	706 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	707 in_string = true;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	708 if (is_arg)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	709 terminate_arg = true;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	710 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	711 else if (! isalpha (c) && c != '_')
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	712 if (! is_arg)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	713 continue;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	714 else if (isdigit (c))
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	715 tmp_arg.append (1, c);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	716 else
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	717 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	718 // Before we do anything remove trailing whitespaces.
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	719 while (i < fun_length && isspace (c))
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	720 c = fun[i++];
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	721
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	722 // Do we have a variable or a function?
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	723 if (c != '(')
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	724 terminate_arg = true;
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	725 else
729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	726 {
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20974 diff changeset	727 tmp_arg = "";
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	728 is_arg = false;
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	729 }
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	730 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	731 else if (! is_arg)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	732 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	733 if (c == 'e' \|\| c == 'E')
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	734 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	735 // possible number in exponent form, not arg
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	736 if (isdigit (fun[i]) \|\| fun[i] == '-' \|\| fun[i] == '+')
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	737 continue;
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	738 }
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	739 is_arg = true;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	740 tmp_arg.append (1, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	741 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	742 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	743 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	744 tmp_arg.append (1, c);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	745 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	746
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	747 if (terminate_arg \|\| (i == fun_length && is_arg))
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	748 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	749 bool have_arg = false;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	750
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	751 for (int j = 0; j < fargs.numel (); j++)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	752 if (tmp_arg == fargs (j))
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	753 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	754 have_arg = true;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	755 break;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	756 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	757
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	758 if (! have_arg && tmp_arg != "i" && tmp_arg != "j"
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	759 && tmp_arg != "NaN" && tmp_arg != "nan"
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	760 && tmp_arg != "Inf" && tmp_arg != "inf"
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	761 && tmp_arg != "NA" && tmp_arg != "pi"
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	762 && tmp_arg != "e" && tmp_arg != "eps")
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	763 fargs.append (tmp_arg);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	764
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20974 diff changeset	765 tmp_arg = "";
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	766 is_arg = false;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	767 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	768 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	769
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	770 // Sort the arguments into ascii order.
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	771 fargs.sort ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	772
20974 1edf15793cac maint: Use is_empty rather than "numel () == 0" for clarity. Rik <rik@octave.org> parents: 20955 diff changeset	773 if (fargs.is_empty ())
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	774 fargs.append (std::string ("x"));
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	775
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	776 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	777 else if (nargin == 2 && args(1).is_numeric_type ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	778 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	779 if (! args(1).is_scalar_type ())
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	780 error ("inline: N must be an integer");
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	781
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	782 int n = args(1).int_value ("inline: N must be an integer");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	783
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	784 if (n < 0)
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	785 error ("inline: N must be a positive integer or zero");
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	786
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	787 fargs.resize (n+1);
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	788
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	789 fargs(0) = "x";
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	790
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	791 for (int i = 1; i < n+1; i++)
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	792 {
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	793 std::ostringstream buf;
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	794 buf << "P" << i;
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	795 fargs(i) = buf.str ();
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	796 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	797 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	798 else
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	799 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	800 fargs.resize (nargin - 1);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	801
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	802 for (int i = 1; i < nargin; i++)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	803 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	804 std::string s = args(i).xstring_value ("inline: additional arguments must be strings");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	805 fargs(i-1) = s;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	806 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	807 }
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	808
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	809 return ovl (new octave_fcn_inline (fun, fargs));
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	810 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	811
7394 872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	812 /*
872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	813 %!shared fn
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	814 %! fn = inline ("x.^2 + 1");
7394 872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	815 %!assert (feval (fn, 6), 37)
872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	816 %!assert (fn (6), 37)
15977 6535f92350ec Always give inline functions a default argument (bug #38164) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15195 diff changeset	817 %!assert (feval (inline ("sum (x(:))"), [1 2; 3 4]), 10)
6535f92350ec Always give inline functions a default argument (bug #38164) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15195 diff changeset	818 %!assert (feval (inline ("sqrt (x^2 + y^2)", "x", "y"), 3, 4), 5)
6535f92350ec Always give inline functions a default argument (bug #38164) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15195 diff changeset	819 %!assert (feval (inline ("exp (P1x) + P2", 3), 3, 4, 5), exp(34) + 5)
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	820
15978 dc5d42399e89 maint: whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15977 diff changeset	821 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	822 %!error inline ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	823 %!error <STR argument must be a string> inline (1)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	824 %!error <N must be an integer> inline ("2", ones (2,2))
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	825 %!error <N must be a positive integer> inline ("2", -1)
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20704 diff changeset	826 %!error <additional arguments must be strings> inline ("2", "x", -1, "y")
7394 872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	827 */
872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	828
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	829 DEFUN (formula, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	830 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20818 diff changeset	831 @deftypefn {} {} formula (@var{fun})\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	832 Return a character string representing the inline function @var{fun}.\n\
19122 c43223245085 doc: Add warnings about eventual removal of inline functions. Rik <rik@octave.org> parents: 18678 diff changeset	833 \n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	834 Note that @code{char (@var{fun})} is equivalent to\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	835 @code{formula (@var{fun})}.\n\
19122 c43223245085 doc: Add warnings about eventual removal of inline functions. Rik <rik@octave.org> parents: 18678 diff changeset	836 @seealso{char, argnames, inline, vectorize}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	837 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	838 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20797 diff changeset	839 if (args.length () != 1)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	840 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	841
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	842 octave_fcn_inline* fn = args(0).fcn_inline_value (true);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	843
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	844 if (! fn)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	845 error ("formula: FUN must be an inline function");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	846
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	847 return ovl (fn->fcn_text ());
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	848 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	849
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	850 /*
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	851 %!assert (formula (fn), "x.^2 + 1")
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	852 %!assert (formula (fn), char (fn))
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	853
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	854 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	855 %!error formula ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	856 %!error formula (1, 2)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	857 %!error <FUN must be an inline function> formula (1)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	858 */
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	859
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	860 DEFUN (argnames, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	861 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20818 diff changeset	862 @deftypefn {} {} argnames (@var{fun})\n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	863 Return a cell array of character strings containing the names of the\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	864 arguments of the inline function @var{fun}.\n\
6529 853f99e292ec [project @ 2007-04-16 21:29:03 by jwe] jwe parents: 6220 diff changeset	865 @seealso{inline, formula, vectorize}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	866 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	867 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20797 diff changeset	868 if (args.length () != 1)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	869 print_usage ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	870
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	871 octave_fcn_inline *fn = args(0).fcn_inline_value (true);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	872
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	873 if (! fn)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	874 error ("argnames: FUN must be an inline function");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	875
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	876 string_vector t1 = fn->fcn_arg_names ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	877
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	878 Cell t2 (dim_vector (t1.numel (), 1));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	879
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	880 for (int i = 0; i < t1.numel (); i++)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	881 t2(i) = t1(i);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	882
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	883 return ovl (t2);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	884 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	885
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	886 /*
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	887 %!assert (argnames (fn), {"x"})
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	888 %!assert (argnames (inline ("1e-3y + 2e4z")), {"y"; "z"})
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	889 %!assert (argnames (inline ("2", 2)), {"x"; "P1"; "P2"})
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	890
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	891 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	892 %!error argnames ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	893 %!error argnames (1, 2)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	894 %!error <FUN must be an inline function> argnames (1)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	895 */
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	896
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	897 DEFUN (vectorize, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	898 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20818 diff changeset	899 @deftypefn {} {} vectorize (@var{fun})\n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	900 Create a vectorized version of the inline function @var{fun} by replacing\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	901 all occurrences of @code{}, @code{/}, etc., with @code{.}, @code{./}, etc.\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	902 \n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	903 This may be useful, for example, when using inline functions with numerical\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19864 diff changeset	904 integration or optimization where a vector-valued function is expected.\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	905 \n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	906 @example\n\
12642 f96b9b9f141b doc: Periodic grammarcheck and spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 12632 diff changeset	907 @group\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	908 fcn = vectorize (inline (\"x^2 - 1\"))\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	909 @result{} fcn = f(x) = x.^2 - 1\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	910 quadv (fcn, 0, 3)\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	911 @result{} 6\n\
12642 f96b9b9f141b doc: Periodic grammarcheck and spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 12632 diff changeset	912 @end group\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	913 @end example\n\
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	914 @seealso{inline, formula, argnames}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	915 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	916 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20797 diff changeset	917 if (args.length () != 1)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	918 print_usage ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	919
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	920 std::string old_func;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	921 octave_fcn_inline* old = 0;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	922 bool func_is_string = true;
5409 fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	923
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	924 if (args(0).is_string ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	925 old_func = args(0).string_value ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	926 else
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	927 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	928 old = args(0).fcn_inline_value (true);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	929 func_is_string = false;
5409 fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	930
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	931 if (old)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	932 old_func = old->fcn_text ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	933 else
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	934 error ("vectorize: FUN must be a string or inline function");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	935 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20447 diff changeset	936
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	937 std::string new_func;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	938 size_t i = 0;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	939
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	940 while (i < old_func.length ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	941 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	942 std::string t1 = old_func.substr (i, 1);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	943
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	944 if (t1 == "*" \|\| t1 == "/" \|\| t1 == "\\" \|\| t1 == "^")
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	945 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	946 if (i && old_func.substr (i-1, 1) != ".")
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	947 new_func.append (".");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	948
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	949 // Special case for ** operator.
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	950 if (t1 == "*" && i < (old_func.length () - 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	951 && old_func.substr (i+1, 1) == "*")
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	952 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	953 new_func.append ("*");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	954 i++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	955 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20447 diff changeset	956 }
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	957 new_func.append (t1);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	958 i++;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	959 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	960
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	961 if (func_is_string)
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	962 return ovl (new_func);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	963 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	964 return ovl (new octave_fcn_inline (new_func, old->fcn_arg_names ()));
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	965 }
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	966
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	967 /*
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	968 %!assert (char (vectorize (fn)), "x.^2 + 1")
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	969 %!assert (char (vectorize (inline ("1e-3y + 2e4z"))), "1e-3.y + 2e4.z")
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	970 %!assert (char (vectorize (inline ("2x^5"))), "2.x.^5")
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	971 %!assert (vectorize ("x.^2 + 1"), "x.^2 + 1")
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	972 %!assert (vectorize ("1e-3y + 2e4z"), "1e-3.y + 2e4.z")
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	973 %!assert (vectorize ("2x^5"), "2.x.^5")
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	974
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	975 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	976 %!error vectorize ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	977 %!error vectorize (1, 2)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	978 %!error <FUN must be a string or inline function> vectorize (1)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	979 */

Mercurial > octave

annotate libinterp/octave-value/ov-fcn-inline.cc @ 21211:2cf8bc5c7017