octave-nkf: src/ov-fcn-inline.cc annotate

annotate src/ov-fcn-inline.cc @ 14429:eff4a5933e28

Update %!tests in src/ directory with Octave coding conventions. * data.cc, defaults.cc, dirfns.cc, file-io.cc, graphics.cc, mappers.cc, oct-map.cc, octave.cc, ov-base.cc, ov-bool-mat.cc, ov-cell.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-range.cc, ov-re-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov.cc, pr-output.cc, pt-binop.cc, pt-eval.cc, pt-idx.cc, pt-mat.cc, sighandlers.cc, strfns.cc, symtab.cc, syscalls.cc, sysdep.cc, toplev.cc, utils.cc, variables.cc: Update %!tests in src/ directory with Octave coding conventions.

author	Rik <octave@nomad.inbox5.com>
date	Sun, 04 Mar 2012 12:21:10 -0800
parents	5a25a51146a1
children

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14098 diff changeset	3 Copyright (C) 2004-2012 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
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	28 #include <config.h>
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"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	40 #include "gripes.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	41 #include "oct-map.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	42 #include "ov-base.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	43 #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	44 #include "ov-usr-fcn.h"
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	45 #include "pr-output.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	46 #include "variables.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	47 #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	48 #include "toplev.h"
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	49
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	50 #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	51 #include "ls-ascii-helper.h"
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	52 #include "ls-oct-ascii.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	53 #include "ls-hdf5.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	54 #include "ls-utils.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	55
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	56 DEFINE_OCTAVE_ALLOCATOR (octave_fcn_inline);
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
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	73 for (int i = 0; i < ifargs.length (); i++)
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
686d5bd22132 ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	131 m.assign ("numArgs", args.length ());
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
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6547 diff changeset	136 for (int i = 0; i < args.length (); i++)
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 {
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	147 os << "# nargs: " << ifargs.length () << "\n";
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	148 for (int i = 0; i < ifargs.length (); 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 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	198 int32_t tmp = ifargs.length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	199 os.write (reinterpret_cast<char *> (&tmp), 4);
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	200 for (int i = 0; i < ifargs.length (); 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 #if defined (HAVE_HDF5)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	277 bool
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	278 octave_fcn_inline::save_hdf5 (hid_t loc_id, const char *name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	279 bool /* save_as_floats */)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	280 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	281 hid_t group_hid = -1;
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	282 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	283 group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	284 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	285 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	286 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	287 if (group_hid < 0 ) return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	288
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	289 size_t len = 0;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	290 for (int i = 0; i < ifargs.length (); i++)
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	291 if (len < ifargs(i).length ())
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	292 len = ifargs(i).length ();
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	293
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	294 hid_t space_hid = -1, data_hid = -1, type_hid = -1;;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	295 bool retval = true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	296
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5765 diff changeset	297 // FIXME Is there a better way of saving string vectors, than a
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	298 // null padded matrix?
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	299
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	300 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	301
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	302 // Octave uses column-major, while HDF5 uses row-major ordering
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	303 hdims[1] = ifargs.length ();
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	304 hdims[0] = len + 1;
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 space_hid = H5Screate_simple (2, hdims, 0);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	307 if (space_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	308 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	309 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	310 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	311 }
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	312 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	313 data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	314 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	315 #else
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	316 data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	317 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	318 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	319 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	320 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	321 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	322 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	323 return false;
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
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	326 OCTAVE_LOCAL_BUFFER (char, s, ifargs.length () * (len + 1));
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	327
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	328 // Save the args as a null teminated list
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	329 for (int i = 0; i < ifargs.length (); i++)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	330 {
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	331 const char * cptr = ifargs(i).c_str ();
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	332 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	333 s[i(len+1)+j] = cptr++;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	334 s[ifargs(i).length ()] = '\0';
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	335 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	336
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	337 retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	338 H5P_DEFAULT, s) >= 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 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	341 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	342
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	343 if (!retval)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	344 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	345 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	346 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	347 }
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 // attach the type of the variable
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	350 type_hid = H5Tcopy (H5T_C_S1);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	351 H5Tset_size (type_hid, nm.length () + 1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	352 if (type_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	353 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	354 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	355 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	356 }
4972 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 hdims[0] = 0;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	359 space_hid = H5Screate_simple (0 , hdims, 0);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	360 if (space_hid < 0)
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 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	363 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	364 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	365 }
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	366 #if HAVE_HDF5_18
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	367 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	368 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	369 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	370 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, 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	371 #endif
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	372 if (data_hid < 0 \|\| H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	373 H5P_DEFAULT, nm.c_str ()) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	374 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	375 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	376 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	377 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	378 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	379 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	380 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	381
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	382 // attach the type of the variable
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	383 H5Tset_size (type_hid, iftext.length () + 1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	384 if (type_hid < 0)
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 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	387 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	388 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	389
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	390 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	391 data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	392 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	393 #else
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	394 data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	395 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	396 #endif
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	397 if (data_hid < 0 \|\| H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	398 H5P_DEFAULT, iftext.c_str ()) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	399 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	400 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	401 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	402 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	403 return false;
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	404 }
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	405
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	406 H5Dclose (data_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	407 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	408 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4973 diff changeset	409 H5Gclose (group_hid);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	410
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	411 return retval;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	412 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	413
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	414 bool
9881 b3089dba88bf Remove HDF5 cruft for older versions of HDF5 Kacper Kowalik parents: 9038 diff changeset	415 octave_fcn_inline::load_hdf5 (hid_t loc_id, const char *name)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	416 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	417 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	418 hsize_t rank;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	419 int slen;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	420
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	421 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	422 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	423 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	424 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	425 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	426 if (group_hid < 0 ) return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	427
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	428 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	429 data_hid = H5Dopen (group_hid, "args", H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	430 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	431 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	432 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	433 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	434 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	435
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	436 if (rank != 2)
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	437 {
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	438 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	439 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	440 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	441 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	442 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	443
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	444 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	445 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	446
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	447 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	448
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	449 ifargs.resize (hdims[1]);
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	450
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	451 OCTAVE_LOCAL_BUFFER (char, s1, hdims[0] * hdims[1]);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	452
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	453 if (H5Dread (data_hid, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	454 H5P_DEFAULT, s1) < 0)
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	455 {
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	456 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	457 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	458 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	459 return false;
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
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	462 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	463 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	464
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	465 for (size_t i = 0; i < hdims[1]; i++)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	466 ifargs(i) = std::string (s1 + i*hdims[0]);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	467
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	468 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	469 data_hid = H5Dopen (group_hid, "nm", H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	470 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	471 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	472 #endif
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	473
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	474 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	475 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	476 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	477 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	478 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	479
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	480 type_hid = H5Dget_type (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	481 type_class_hid = H5Tget_class (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	482
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	483 if (type_class_hid != H5T_STRING)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	484 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	485 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	486 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	487 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	488 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	489 }
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	490
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	491 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	492 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	493
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	494 if (rank != 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	495 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	496 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	497 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	498 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	499 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	500 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	501 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	502
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	503 slen = H5Tget_size (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	504 if (slen < 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 OCTAVE_LOCAL_BUFFER (char, nm_tmp, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	514
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	515 // create datatype for (null-terminated) string to read into:
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	516 st_id = H5Tcopy (H5T_C_S1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	517 H5Tset_size (st_id, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	518
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	519 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, nm_tmp) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	520 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	521 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	522 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	523 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	524 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	525 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	526 H5Tclose (st_id);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	527 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	528 nm = nm_tmp;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	529
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	530 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	531 data_hid = H5Dopen (group_hid, "iftext", H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	532 #else
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	533 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	534 #endif
4972 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 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	537 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	538 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	539 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	540 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	541
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	542 type_hid = H5Dget_type (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	543 type_class_hid = H5Tget_class (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	544
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	545 if (type_class_hid != H5T_STRING)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	546 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	547 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	548 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	549 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	550 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	551 }
4973 c969a018c928 [project @ 2004-09-08 17:07:11 by jwe] jwe parents: 4972 diff changeset	552
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	553 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	554 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	555
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	556 if (rank != 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	557 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	558 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	559 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	560 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	561 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	562 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	563 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	564
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	565 slen = H5Tget_size (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	566 if (slen < 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 OCTAVE_LOCAL_BUFFER (char, iftext_tmp, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	576
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	577 // create datatype for (null-terminated) string to read into:
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	578 st_id = H5Tcopy (H5T_C_S1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	579 H5Tset_size (st_id, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	580
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5642 diff changeset	581 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, iftext_tmp) < 0)
4972 724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	582 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	583 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	584 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	585 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	586 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	587 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	588 H5Tclose (st_id);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	589 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	590 iftext = iftext_tmp;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	591
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	592 octave_fcn_inline ftmp (iftext, ifargs, nm);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	593 fcn = ftmp.fcn;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	594
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	595 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	596 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	597 #endif
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe] jwe parents: 4966 diff changeset	598
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	599 void
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	600 octave_fcn_inline::print (std::ostream& os, bool pr_as_read_syntax) const
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	601 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	602 print_raw (os, pr_as_read_syntax);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	603 newline (os);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	604 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	605
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	606 void
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	607 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	608 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	609 std::ostringstream buf;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	610
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	611 if (nm.empty ())
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	612 buf << "f(";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	613 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	614 buf << nm << "(";
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 for (int i = 0; i < ifargs.length (); i++)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	617 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	618 if (i)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	619 buf << ", ";
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	620
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	621 buf << ifargs(i);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	622 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	623
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	624 buf << ") = " << iftext;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	625
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	626 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	627 current_print_indent_level ());
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	628 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	629
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	630 octave_value
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5164 diff changeset	631 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	632 {
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5164 diff changeset	633 return octave_value (fcn_text (), type);
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
6973 6fcc2f5b2c7d [project @ 2007-10-08 10:22:17 by jwe] jwe parents: 6635 diff changeset	636 DEFUNX ("inline", Finline, args, ,
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	637 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10742 diff changeset	638 @deftypefn {Built-in Function} {} inline (@var{str})\n\
6547 4fb053f24fd6 [project @ 2007-04-19 21:47:40 by jwe] jwe parents: 6529 diff changeset	639 @deftypefnx {Built-in Function} {} inline (@var{str}, @var{arg1}, @dots{})\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	640 @deftypefnx {Built-in Function} {} inline (@var{str}, @var{n})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	641 Create an inline function from the character string @var{str}.\n\
5034 49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe] jwe parents: 5025 diff changeset	642 If called with a single argument, the arguments of the generated\n\
9038 fca0dc2fb042 Cleanup documentation files stmt.texi and func.texi Rik <rdrider0-list@yahoo.com> parents: 8946 diff changeset	643 function are extracted from the function itself. The generated\n\
fca0dc2fb042 Cleanup documentation files stmt.texi and func.texi Rik <rdrider0-list@yahoo.com> parents: 8946 diff changeset	644 function arguments will then be in alphabetical order. It should\n\
5034 49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe] jwe parents: 5025 diff changeset	645 be noted that i, and j are ignored as arguments due to the\n\
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe] jwe parents: 5025 diff changeset	646 ambiguity between their use as a variable or their use as an inbuilt\n\
9038 fca0dc2fb042 Cleanup documentation files stmt.texi and func.texi Rik <rdrider0-list@yahoo.com> parents: 8946 diff changeset	647 constant. All arguments followed by a parenthesis are considered\n\
5034 49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe] jwe parents: 5025 diff changeset	648 to be functions.\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	649 \n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	650 If the second and subsequent arguments are character strings,\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	651 they are the names of the arguments of the function.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	652 \n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	653 If the second argument is an integer @var{n}, the arguments are\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	654 @code{\"x\"}, @code{\"P1\"}, @dots{}, @code{\"P@var{N}\"}.\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	655 @seealso{argnames, formula, vectorize}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	656 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	657 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	658 octave_value retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	659
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	660 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	661
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	662 if (nargin > 0)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	663 {
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	664 if (args(0).is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	665 {
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	666 std::string fun = args(0).string_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	667 string_vector fargs;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	668
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	669 if (nargin == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	670 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	671 bool is_arg = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	672 bool in_string = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	673 std::string tmp_arg;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	674 size_t i = 0;
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	675 size_t fun_length = fun.length ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	676
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	677 while (i < fun_length)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	678 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	679 bool terminate_arg = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	680 char c = fun[i++];
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	681
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	682 if (in_string)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	683 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	684 if (c == '\'' \|\| c == '\"')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	685 in_string = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	686 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	687 else if (c == '\'' \|\| c == '\"')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	688 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	689 in_string = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	690 if (is_arg)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	691 terminate_arg = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	692 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	693 else if (! isalpha (c) && c != '_')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	694 if (! is_arg)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	695 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	696 else if (isdigit (c))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	697 tmp_arg.append (1, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	698 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	699 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	700 // Before we do anything remove trailing whitespaces.
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	701 while (i < fun_length && isspace (c))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	702 c = fun[i++];
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	703
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	704 // Do we have a variable or a function?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	705 if (c != '(')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	706 terminate_arg = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	707 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	708 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	709 tmp_arg = std::string ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	710 is_arg = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	711 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	712 }
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	713 else if (! is_arg)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	714 {
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	715 if (c == 'e' \|\| c == 'E')
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	716 {
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	717 // possible number in exponent form, not arg
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	718 if (isdigit (fun[i])
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	719 \|\| fun[i] == '-' \|\| fun[i] == '+')
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	720 continue;
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	721 }
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	722 is_arg = true;
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	723 tmp_arg.append (1, c);
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	724 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	725 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	726 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	727 tmp_arg.append (1, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	728 }
5034 49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe] jwe parents: 5025 diff changeset	729
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	730 if (terminate_arg \|\| (i == fun_length && is_arg))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	731 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	732 bool have_arg = false;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	733
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	734 for (int j = 0; j < fargs.length (); j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	735 if (tmp_arg == fargs (j))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	736 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	737 have_arg = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	738 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	739 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	740
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	741 if (! have_arg && tmp_arg != "i" && tmp_arg != "j" &&
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	742 tmp_arg != "NaN" && tmp_arg != "nan" &&
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	743 tmp_arg != "Inf" && tmp_arg != "inf" &&
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	744 tmp_arg != "NA" && tmp_arg != "pi" &&
14145 5a25a51146a1 ov-fcn-inline.cc (Vinline): Add "e" to the built-in variables (bug #35236) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	745 tmp_arg != "e" && tmp_arg != "eps")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	746 fargs.append (tmp_arg);
5037 70be065b8201 [project @ 2004-09-24 14:59:24 by jwe] jwe parents: 5034 diff changeset	747
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	748 tmp_arg = std::string ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	749 is_arg = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	750 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	751 }
5034 49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe] jwe parents: 5025 diff changeset	752
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	753 // Sort the arguments into ascii order.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	754 fargs.sort ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	755 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	756 else if (nargin == 2 && args(1).is_numeric_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	757 {
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	758 if (! args(1).is_scalar_type ())
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	759 {
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	760 error ("inline: N must be an integer");
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	761 return retval;
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	762 }
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	763
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	764 int n = args(1).int_value ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	765
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	766 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	767 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	768 if (n >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	769 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	770 fargs.resize (n+1);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	771
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	772 fargs(0) = "x";
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	773
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	774 for (int i = 1; i < n+1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	775 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	776 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	777 buf << "P" << i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	778 fargs(i) = buf.str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	779 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	780 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	781 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	782 {
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	783 error ("inline: N must be a positive integer or zero");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	784 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	785 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	786 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	787 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	788 {
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	789 error ("inline: N must be an integer");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	790 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	791 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	792 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	793 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	794 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	795 fargs.resize (nargin - 1);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	796
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	797 for (int i = 1; i < nargin; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	798 {
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	799 if (args(i).is_string ())
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	800 {
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	801 std::string s = args(i).string_value ();
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	802 fargs(i-1) = s;
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	803 }
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	804 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	805 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	806 error ("inline: expecting string arguments");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	807 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	808 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	809 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	810 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	811
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	812 retval = octave_value (new octave_fcn_inline (fun, fargs));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	813 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	814 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	815 error ("inline: STR argument must be a string");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	816 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	817 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	818 print_usage ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	819
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	820 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	821 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	822
7394 872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	823 /*
872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	824 %!shared fn
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	825 %! fn = inline ("x.^2 + 1");
7394 872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	826 %!assert (feval (fn, 6), 37)
872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	827 %!assert (fn (6), 37)
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	828 ## FIXME: Need tests for other 2 calling forms of inline()
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	829
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	830 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	831 %!error inline ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	832 %!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	833 %!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	834 %!error <N must be a positive integer> inline ("2", -1)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	835 %!error <expecting string arguments> inline ("2", "x", -1, "y")
7394 872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	836 */
872b263b7e62 [project @ 2008-01-17 10:16:15 by dbateman] dbateman parents: 7017 diff changeset	837
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	838 DEFUN (formula, args, ,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	839 "-- texinfo --\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	840 @deftypefn {Built-in Function} {} formula (@var{fun})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	841 Return a character string representing the inline function @var{fun}.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	842 Note that @code{char (@var{fun})} is equivalent to\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	843 @code{formula (@var{fun})}.\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	844 @seealso{argnames, inline, vectorize}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	845 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	846 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	847 octave_value retval;
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 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	850
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	851 if (nargin == 1)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	852 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	853 octave_fcn_inline* fn = args(0).fcn_inline_value (true);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	854
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	855 if (fn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	856 retval = octave_value (fn->fcn_text ());
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	857 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	858 error ("formula: FUN must be an inline function");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	859 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	860 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	861 print_usage ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	862
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	863 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	864 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	865
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	866 /*
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	867 %!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	868 %!assert (formula (fn), char (fn))
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	869
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	870 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	871 %!error formula ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	872 %!error formula (1, 2)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	873 %!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	874 */
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	875
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	876 DEFUN (argnames, args, ,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	877 "-- texinfo --\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	878 @deftypefn {Built-in Function} {} argnames (@var{fun})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	879 Return a cell array of character strings containing the names of\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	880 the arguments of the inline function @var{fun}.\n\
6529 853f99e292ec [project @ 2007-04-16 21:29:03 by jwe] jwe parents: 6220 diff changeset	881 @seealso{inline, formula, vectorize}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	882 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	883 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	884 octave_value retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	885
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	886 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	887
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	888 if (nargin == 1)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	889 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	890 octave_fcn_inline *fn = args(0).fcn_inline_value (true);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	891
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	892 if (fn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	893 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	894 string_vector t1 = fn->fcn_arg_names ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	895
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	896 Cell t2 (dim_vector (t1.length (), 1));
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	897
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	898 for (int i = 0; i < t1.length (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	899 t2(i) = t1(i);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	900
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	901 retval = t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	902 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	903 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	904 error ("argnames: FUN must be an inline function");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	905 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	906 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	907 print_usage ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	908
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	909 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	910 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	911
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	912 /*
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	913 %!assert (argnames (fn), {"x"})
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	914 %!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	915 %!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	916
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	917 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	918 %!error argnames ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	919 %!error argnames (1, 2)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	920 %!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	921 */
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	922
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	923 DEFUN (vectorize, args, ,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	924 "-- texinfo --\n\
6635 c9c504d939c5 [project @ 2007-05-19 10:36:56 by dbateman] dbateman parents: 6625 diff changeset	925 @deftypefn {Built-in Function} {} vectorize (@var{fun})\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	926 Create a vectorized version of the inline function @var{fun}\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	927 by replacing all occurrences of @code{*}, @code{/}, etc., with\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	928 @code{.*}, @code{./}, etc.\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	929 \n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	930 This may be useful, for example, when using inline functions with\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	931 numerical integration or optimization where a vector-valued function\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	932 is expected.\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	933 \n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	934 @example\n\
12642 f96b9b9f141b doc: Periodic grammarcheck and spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 12632 diff changeset	935 @group\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	936 fcn = vectorize (inline (\"x^2 - 1\"))\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	937 @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	938 quadv (fcn, 0, 3)\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	939 @result{} 6\n\
12642 f96b9b9f141b doc: Periodic grammarcheck and spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 12632 diff changeset	940 @end group\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	941 @end example\n\
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	942 @seealso{inline, formula, argnames}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5409 diff changeset	943 @end deftypefn")
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	944 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	945 octave_value retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	946
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	947 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	948
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	949 if (nargin == 1)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	950 {
5409 fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	951 std::string old_func;
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	952 octave_fcn_inline* old = 0;
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	953 bool func_is_string = true;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	954
5409 fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	955 if (args(0).is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	956 old_func = args(0).string_value ();
5409 fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	957 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	958 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	959 old = args(0).fcn_inline_value (true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	960 func_is_string = false;
5409 fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	961
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	962 if (old)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	963 old_func = old->fcn_text ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	964 else
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	965 error ("vectorize: FUN must be a string or inline function");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	966 }
5409 fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	967
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman] dbateman parents: 5307 diff changeset	968 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	969 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	970 std::string new_func;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	971 size_t i = 0;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	972
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	973 while (i < old_func.length ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	974 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	975 std::string t1 = old_func.substr (i, 1);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	976
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	977 if (t1 == "*" \|\| t1 == "/" \|\| t1 == "\\" \|\| t1 == "^")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	978 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	979 if (i && old_func.substr (i-1, 1) != ".")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	980 new_func.append (".");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	981
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	982 // Special case for ** operator.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	983 if (t1 == "*" && i < (old_func.length () - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	984 && old_func.substr (i+1, 1) == "*")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	985 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	986 new_func.append ("*");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	987 i++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	988 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	989 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	990 new_func.append (t1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	991 i++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	992 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	993
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	994 if (func_is_string)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	995 retval = octave_value (new_func);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	996 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	997 retval = octave_value (new octave_fcn_inline
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	998 (new_func, old->fcn_arg_names ()));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	999 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	1000 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	1001 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1002 print_usage ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	1003
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	1004 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: diff changeset	1005 }
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	1006
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	1007 /*
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	1008 %!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	1009 %!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	1010 %!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	1011 %!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	1012 %!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	1013 %!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	1014
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14145 diff changeset	1015 ## Test input validation
14098 ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	1016 %!error vectorize ()
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	1017 %!error vectorize (1, 2)
ebf41239e47e Allow exponential numbers (1e-3) in inline() (Bug #35131) Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	1018 %!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	1019 */

Mercurial > octave-nkf

annotate src/ov-fcn-inline.cc @ 14429:eff4a5933e28