annotate src/ov-fcn-inline.cc @ 5409:fda074a55b5c

[project @ 2005-07-11 08:41:16 by dbateman]
author dbateman
date Mon, 11 Jul 2005 08:41:16 +0000
parents 4c8a2e4e0717
children 2618a0750ae6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
3 Copyright (C) 2004 David Bateman
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
4
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
5 This program is free software; you can redistribute it and/or modify it
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
6 under the terms of the GNU General Public License as published by
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
7 the Free Software Foundation; either version 2, or (at your option)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
8 any later version.
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
9
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
10 This program is distributed in the hope that it will be useful, but
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
11 WITHOUT ANY WARRANTY; without even the implied warranty of
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
13 General Public License for more details.
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
14
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
16 along with Octave; see the file COPYING. If not, write to the Free
5307
4c8a2e4e0717 [project @ 2005-04-26 19:24:27 by jwe]
jwe
parents: 5279
diff changeset
17 Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
4c8a2e4e0717 [project @ 2005-04-26 19:24:27 by jwe]
jwe
parents: 5279
diff changeset
18 02110-1301, USA.
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
19
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
20 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
21 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
22 Open Source Initiative (www.opensource.org)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
23
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 #ifdef HAVE_CONFIG_H
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
27 #include <config.h>
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
28 #endif
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
29
4988
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
30 #include <istream>
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
31 #include <iostream>
5164
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe]
jwe
parents: 5105
diff changeset
32 #include <vector>
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
33
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
34 #include "defun.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
35 #include "error.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
36 #include "gripes.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
37 #include "oct-map.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
38 #include "ov-base.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
39 #include "ov-fcn-inline.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
40 #include "pr-output.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
41 #include "variables.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
42 #include "parse.h"
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
43
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
44 #include "byte-swap.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
45 #include "ls-oct-ascii.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
46 #include "ls-hdf5.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
47 #include "ls-utils.h"
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
48
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
49 DEFINE_OCTAVE_ALLOCATOR (octave_fcn_inline);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
50
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
51 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fcn_inline,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
52 "inline function",
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
53 "inline function");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
54
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
55 octave_fcn_inline::octave_fcn_inline (const std::string& f,
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
56 const string_vector& a,
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
57 const std::string& n)
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
58 : octave_fcn_handle (n), iftext (f), ifargs (a)
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
59 {
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
60 // Form a string representing the function.
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 OSSTREAM buf;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
63
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
64 buf << "@(";
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
65
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
66 for (int i = 0; i < ifargs.length (); i++)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
67 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
68 if (i > 0)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
69 buf << ", ";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
70
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
71 buf << ifargs(i);
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
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
74 buf << ") " << iftext << OSSTREAM_ENDS;
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
75
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
76 int parse_status;
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
77 octave_value anon_fcn_handle = eval_string (OSSTREAM_STR (buf), true,
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
78 parse_status);
4933
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 OSSTREAM_FREEZE (buf);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
81
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
82 if (parse_status == 0)
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
83 {
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
84 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
85
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
86 if (fh)
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
87 fcn = fh->fcn_val ();
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
88 }
5007
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
89
f8c27dad3643 [project @ 2004-09-17 11:42:04 by jwe]
jwe
parents: 4988
diff changeset
90 if (fcn.is_undefined ())
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
91 error ("inline: unable to define function");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
92 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
93
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
94 bool
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
95 octave_fcn_inline::save_ascii (std::ostream& os, bool&, bool)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
96 {
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
97 os << "# nargs: " << ifargs.length () << "\n";
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
98 for (int i = 0; i < ifargs.length (); i++)
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
99 os << ifargs(i) << "\n";
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
100 if (nm.length () < 1)
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
101 // 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
102 os << "0\n";
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
103 else
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
104 os << nm << "\n";
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
105 os << iftext << "\n";
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
106 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
107 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
108
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
109 bool
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
110 octave_fcn_inline::load_ascii (std::istream& is)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
111 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
112 int nargs;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
113 if (extract_keyword (is, "nargs", nargs, true))
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
114 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
115 ifargs.resize (nargs);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
116 for (int i = 0; i < nargs; i++)
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
117 is >> ifargs(i);
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
118 is >> nm;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
119 if (nm == "0")
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
120 nm = "";
4988
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
121
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
122 char c;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
123 OSSTREAM buf;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
124
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
125 // Skip preceeding newline(s)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
126 while (is.get (c) && c == '\n');
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
127
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
128 if (is)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
129 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
130 buf << c;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
131
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
132 // Get a line of text whitespace characters included, leaving
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
133 // newline in the stream
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
134 while (is.peek () != '\n')
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
135 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
136 is.get (c);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
137 if (! is)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
138 break;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
139 buf << c;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
140 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
141 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
142
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
143 buf << OSSTREAM_ENDS;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
144 iftext = OSSTREAM_STR (buf);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
145 OSSTREAM_FREEZE (buf);
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
146
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
147 octave_fcn_inline tmp (iftext, ifargs, nm);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
148 fcn = tmp.fcn;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
149
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
150 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
151 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
152 else
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
153 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
154 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
155
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
156 bool
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
157 octave_fcn_inline::save_binary (std::ostream& os, bool&)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
158 {
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
159 FOUR_BYTE_INT tmp = ifargs.length ();
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
160 os.write (X_CAST (char *, &tmp), 4);
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
161 for (int i = 0; i < ifargs.length (); i++)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
162 {
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
163 tmp = ifargs(i).length ();
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
164 os.write (X_CAST (char *, &tmp), 4);
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
165 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
166 }
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
167 tmp = nm.length ();
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
168 os.write (X_CAST (char *, &tmp), 4);
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
169 os.write (nm.c_str (), nm.length ());
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
170 tmp = iftext.length ();
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
171 os.write (X_CAST (char *, &tmp), 4);
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
172 os.write (iftext.c_str (), iftext.length ());
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
173 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
174 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
175
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
176 bool
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
177 octave_fcn_inline::load_binary (std::istream& is, bool swap,
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
178 oct_mach_info::float_format)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
179 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
180 FOUR_BYTE_INT nargs;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
181 if (! is.read (X_CAST (char *, &nargs), 4))
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
182 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
183 if (swap)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
184 swap_bytes<4> (&nargs);
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 if (nargs < 1)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
187 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
188 else
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
189 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
190 FOUR_BYTE_INT tmp;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
191 ifargs.resize (nargs);
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
192 for (int i = 0; i < nargs; i++)
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 if (! is.read (X_CAST (char *, &tmp), 4))
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
195 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
196 if (swap)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
197 swap_bytes<4> (&tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
198
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
199 OCTAVE_LOCAL_BUFFER (char, ctmp, tmp+1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
200 is.read (ctmp, tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
201 ifargs(i) = std::string (ctmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
202
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
203 if (! is)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
204 return false;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
205 }
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
206
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
207 if (! is.read (X_CAST (char *, &tmp), 4))
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
208 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
209 if (swap)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
210 swap_bytes<4> (&tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
211
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
212 OCTAVE_LOCAL_BUFFER (char, ctmp1, tmp+1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
213 is.read (ctmp1, tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
214 nm = std::string (ctmp1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
215
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
216 if (! is)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
217 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
218
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
219 if (! is.read (X_CAST (char *, &tmp), 4))
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
220 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
221 if (swap)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
222 swap_bytes<4> (&tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
223
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
224 OCTAVE_LOCAL_BUFFER (char, ctmp2, tmp+1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
225 is.read (ctmp2, tmp);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
226 iftext = std::string (ctmp2);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
227
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
228 if (! is)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
229 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
230
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
231 octave_fcn_inline ftmp (iftext, ifargs, nm);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
232 fcn = ftmp.fcn;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
233 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
234 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
235 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
236
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
237 #if defined (HAVE_HDF5)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
238 bool
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
239 octave_fcn_inline::save_hdf5 (hid_t loc_id, const char *name,
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
240 bool /* save_as_floats */)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
241 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
242 hid_t group_hid = -1;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
243 group_hid = H5Gcreate (loc_id, name, 0);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
244 if (group_hid < 0 ) return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
245
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
246 size_t len = 0;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
247 for (int i = 0; i < ifargs.length (); i++)
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
248 if (len < ifargs(i).length ())
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
249 len = ifargs(i).length ();
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 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
252 bool retval = true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
253
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
254 // XXX FIXME XXX Is there a better way of saving string vectors, than a
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
255 // null padded matrix?
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
256
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
257 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
258
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
259 // 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
260 hdims[1] = ifargs.length ();
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
261 hdims[0] = len + 1;
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 space_hid = H5Screate_simple (2, hdims, 0);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
264 if (space_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
265 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
266 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
267 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
268 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
269
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
270 data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid,
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
271 H5P_DEFAULT);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
272 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
273 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
274 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
275 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
276 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
277 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
278
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
279 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
280
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
281 // Save the args as a null teminated list
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
282 for (int i = 0; i < ifargs.length (); i++)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
283 {
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
284 const char * cptr = ifargs(i).c_str ();
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
285 for (size_t j = 0; j < ifargs(i).length (); j++)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
286 s[i*(len+1)+j] = *cptr++;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
287 s[ifargs(i).length ()] = '\0';
4972
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
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
290 retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL,
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
291 H5P_DEFAULT, s) >= 0;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
292
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
293 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
294 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
295
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
296 if (!retval)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
297 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
298 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
299 return false;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
300 }
4972
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 // attach the type of the variable
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
303 type_hid = H5Tcopy (H5T_C_S1);
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
304 H5Tset_size (type_hid, nm.length () + 1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
305 if (type_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
306 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
307 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
308 return false;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
309 }
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
310
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
311 hdims[0] = 0;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
312 space_hid = H5Screate_simple (0 , hdims, (hsize_t*) 0);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
313 if (space_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
314 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
315 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
316 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
317 return false;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
318 }
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
319
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
320 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, H5P_DEFAULT);
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
321 if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL,
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
322 H5P_DEFAULT, (void*) nm.c_str ()) < 0)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
323 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
324 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
325 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
326 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
327 return false;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
328 }
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
329 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
330
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
331 // attach the type of the variable
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
332 H5Tset_size (type_hid, iftext.length () + 1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
333 if (type_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
334 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
335 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
336 return false;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
337 }
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
338
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
339 data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid,
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
340 H5P_DEFAULT);
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
341 if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL,
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
342 H5P_DEFAULT, (void*) iftext.c_str ()) < 0)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
343 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
344 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
345 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
346 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
347 return false;
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
348 }
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
349
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
350 H5Dclose (data_hid);
4988
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
351 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
352 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe]
jwe
parents: 4973
diff changeset
353 H5Gclose (group_hid);
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
354
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
355 return retval;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
356 }
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 bool
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
359 octave_fcn_inline::load_hdf5 (hid_t loc_id, const char *name,
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
360 bool /* have_h5giterate_bug */)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
361 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
362 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
363 hsize_t rank;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
364 int slen;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
365
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
366 group_hid = H5Gopen (loc_id, name);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
367 if (group_hid < 0 ) return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
368
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
369 data_hid = H5Dopen (group_hid, "args");
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
370 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
371 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
372
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
373 if (rank != 2)
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
374 {
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
375 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
376 H5Sclose (space_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;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
379 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
380
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
381 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
382 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
383
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
384 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
385
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
386 ifargs.resize (hdims[1]);
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
387
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
388 OCTAVE_LOCAL_BUFFER (char, s1, hdims[0] * hdims[1]);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
389
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
390 if (H5Dread (data_hid, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL,
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
391 H5P_DEFAULT, s1) < 0)
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
392 {
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
393 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
394 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
395 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
396 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
397 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
398
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
399 H5Dclose (data_hid);
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
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
402 for (size_t i = 0; i < hdims[1]; i++)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
403 ifargs(i) = std::string (s1 + i*hdims[0]);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
404
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
405 data_hid = H5Dopen (group_hid, "nm");
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
406
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
407 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
408 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
409 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
410 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
411 }
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 type_hid = H5Dget_type (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
414 type_class_hid = H5Tget_class (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
415
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
416 if (type_class_hid != H5T_STRING)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
417 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
418 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
419 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
420 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
421 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
422 }
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
423
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
424 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
425 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
426
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
427 if (rank != 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
428 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
429 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
430 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
431 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
432 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
433 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
434 }
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 slen = H5Tget_size (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
437 if (slen < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
438 {
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 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
441 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
442 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
443 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
444 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
445
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
446 OCTAVE_LOCAL_BUFFER (char, nm_tmp, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
447
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
448 // create datatype for (null-terminated) string to read into:
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
449 st_id = H5Tcopy (H5T_C_S1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
450 H5Tset_size (st_id, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
451
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
452 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT,
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
453 X_CAST (void *, nm_tmp)) < 0)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
454 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
455 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
456 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
457 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
458 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
459 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
460 H5Tclose (st_id);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
461 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
462 nm = nm_tmp;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
463
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
464 data_hid = H5Dopen (group_hid, "iftext");
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
465
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
466 if (data_hid < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
467 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
468 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
469 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
470 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
471
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
472 type_hid = H5Dget_type (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
473 type_class_hid = H5Tget_class (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
474
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
475 if (type_class_hid != H5T_STRING)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
476 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
477 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
478 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
479 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
480 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
481 }
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
482
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
483 space_hid = H5Dget_space (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
484 rank = H5Sget_simple_extent_ndims (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
485
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
486 if (rank != 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
487 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
488 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
489 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
490 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
491 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
492 return false;
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
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
495 slen = H5Tget_size (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
496 if (slen < 0)
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
497 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
498 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
499 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
500 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
501 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
502 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
503 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
504
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
505 OCTAVE_LOCAL_BUFFER (char, iftext_tmp, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
506
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
507 // create datatype for (null-terminated) string to read into:
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
508 st_id = H5Tcopy (H5T_C_S1);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
509 H5Tset_size (st_id, slen);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
510
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
511 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT,
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
512 X_CAST (void *, iftext_tmp)) < 0)
4972
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
513 {
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
514 H5Sclose (space_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
515 H5Tclose (type_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
516 H5Gclose (group_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
517 return false;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
518 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
519 H5Tclose (st_id);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
520 H5Dclose (data_hid);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
521 iftext = iftext_tmp;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
522
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
523 octave_fcn_inline ftmp (iftext, ifargs, nm);
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
524 fcn = ftmp.fcn;
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 return true;
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
527 }
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
528 #endif
724675f7f7cb [project @ 2004-09-08 17:00:20 by jwe]
jwe
parents: 4966
diff changeset
529
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
530 void
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
531 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
532 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
533 print_raw (os, pr_as_read_syntax);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
534 newline (os);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
535 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
536
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
537 void
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
538 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
539 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
540 OSSTREAM buf;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
541
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
542 if (nm.empty ())
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
543 buf << "f(";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
544 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
545 buf << nm << "(";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
546
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
547 for (int i = 0; i < ifargs.length (); i++)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
548 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
549 if (i)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
550 buf << ", ";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
551
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
552 buf << ifargs(i);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
553 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
554
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
555 buf << ") = " << iftext << OSSTREAM_ENDS;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
556
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
557 octave_print_internal (os, OSSTREAM_STR (buf), pr_as_read_syntax,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
558 current_print_indent_level ());
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
559 OSSTREAM_FREEZE (buf);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
560 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
561
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
562 octave_value
5279
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe]
jwe
parents: 5164
diff changeset
563 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
564 {
5279
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe]
jwe
parents: 5164
diff changeset
565 return octave_value (fcn_text (), type);
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
566 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
567
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
568 DEFUN (inline, args, ,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
569 "-*- texinfo -*-\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
570 @deftypefn {Built-in Function} {} inline (@var{str})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
571 @deftypefnx {Built-in Function} {} inline (@var{str}, @var{arg1}, ...)\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
572 @deftypefnx {Built-in Function} {} inline (@var{str}, @var{n})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
573 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
574 If called with a single argument, the arguments of the generated\n\
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
575 function are extracted from the function itself. The generated\n\
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
576 function arguments will then be in alphabetical order. It should\n\
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
577 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
578 ambiguity between their use as a variable or their use as an inbuilt\n\
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
579 constant. All arguments followed by a parentheses are considered\n\
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
580 to be functions.\n\
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
581 \n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
582 If the second and subsequent arguments are character strings,\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
583 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
584 \n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
585 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
586 @code{\"x\"}, @code{\"P1\"}, @dots{}, @code{\"P@var{N}\"}.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
587 @end deftypefn\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
588 @seealso{argnames, formula, vectorize}")
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
589 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
590 octave_value retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
591
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
592 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
593
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
594 if (nargin > 0)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
595 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
596 std::string fun = args(0).string_value ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
597
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
598 if (! error_state)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
599 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
600 string_vector fargs;
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 if (nargin == 1)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
603 {
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
604 bool is_arg = false;
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
605 bool in_string = false;
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
606 std::string tmp_arg;
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
607 size_t i = 0;
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
608
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
609 while (i < fun.length ())
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
610 {
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
611 bool terminate_arg = false;
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
612 char c = fun[i++];
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
613
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
614 if (in_string)
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
615 {
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
616 if (c == '\'' || c == '\"')
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
617 in_string = false;
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
618 }
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
619 else if (c == '\'' || c == '\"')
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
620 {
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
621 in_string = true;
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
622 if (is_arg)
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
623 terminate_arg = true;
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
624 }
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
625 else if (! isalpha (c) && c != '_')
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
626 if (! is_arg)
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
627 continue;
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
628 else if (isdigit (c))
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
629 tmp_arg.append (1, c);
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
630 else
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
631 {
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
632 // Before we do anything remove trailing whitespaces.
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
633 while (i < fun.length () && isspace (c))
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
634 c = fun[i++];
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
635
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
636 // Do we have a variable or a function?
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
637 if (c != '(')
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
638 terminate_arg = true;
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
639 else
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
640 {
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
641 tmp_arg = std::string ();
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
642 is_arg = false;
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
643 }
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
644 }
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
645 else
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
646 {
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
647 tmp_arg.append (1, c);
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
648 is_arg = true;
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
649 }
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
650
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
651 if (terminate_arg || (i == fun.length () && is_arg))
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
652 {
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
653 bool have_arg = false;
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
654
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
655 for (int j = 0; j < fargs.length (); j++)
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
656 if (tmp_arg == fargs (j))
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
657 {
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
658 have_arg = true;
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
659 break;
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
660 }
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
661
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
662 if (! have_arg && tmp_arg != "i" && tmp_arg != "j")
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
663 fargs.append (tmp_arg);
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
664
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
665 tmp_arg = std::string ();
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
666 is_arg = false;
5022
4da942f0b76f [project @ 2004-09-22 15:05:43 by jwe]
jwe
parents: 5007
diff changeset
667 }
4da942f0b76f [project @ 2004-09-22 15:05:43 by jwe]
jwe
parents: 5007
diff changeset
668 }
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
669
5037
70be065b8201 [project @ 2004-09-24 14:59:24 by jwe]
jwe
parents: 5034
diff changeset
670 // Sort the arguments into ascii order.
5034
49827f6892f4 [project @ 2004-09-24 13:28:56 by jwe]
jwe
parents: 5025
diff changeset
671 fargs.qsort ();
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
672 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
673 else if (nargin == 2 && args(1).is_numeric_type ())
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
674 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
675 int n = args(1).int_value ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
676
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
677 if (! error_state)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
678 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
679 if (n >= 0)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
680 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
681 fargs.resize (n+1);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
682
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
683 fargs(0) = "x";
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
684
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
685 for (int i = 1; i < n+1; i++)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
686 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
687 OSSTREAM buf;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
688 buf << "P" << i << OSSTREAM_ENDS;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
689 fargs(i) = OSSTREAM_STR (buf);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
690 OSSTREAM_FREEZE (buf);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
691 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
692 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
693 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
694 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
695 error ("inline: numeric argument must be nonnegative");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
696 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
697 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
698 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
699 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
700 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
701 error ("inline: expecting second argument to be an integer");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
702 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
703 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
704 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
705 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
706 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
707 fargs.resize (nargin - 1);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
708
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
709 for (int i = 1; i < nargin; i++)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
710 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
711 std::string s = args(i).string_value ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
712
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
713 if (! error_state)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
714 fargs(i-1) = s;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
715 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
716 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
717 error ("inline: expecting string arguments");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
718 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
719 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
720 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
721 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
722
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
723 retval = octave_value (new octave_fcn_inline (fun, fargs));
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
724 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
725 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
726 error ("inline: first argument must be a string");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
727 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
728 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
729 print_usage ("inline");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
730
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
731 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
732 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
733
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
734 DEFUN (formula, args, ,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
735 "-*- texinfo -*-\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
736 @deftypefn {Built-in Function} {} formula (@var{fun})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
737 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
738 Note that @code{char (@var{fun})} is equivalent to\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
739 @code{formula (@var{fun})}.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
740 @end deftypefn\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
741 @seealso{argnames, inline, vectorize}")
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
742 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
743 octave_value retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
744
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
745 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
746
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
747 if (nargin == 1)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
748 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
749 octave_fcn_inline* fn = args(0).fcn_inline_value (true);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
750
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
751 if (fn)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
752 retval = octave_value (fn->fcn_text ());
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
753 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
754 error ("formula: must be an inline function");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
755 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
756 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
757 print_usage ("formula");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
758
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
759 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
760 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
761
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
762 DEFUN (argnames, args, ,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
763 "-*- texinfo -*-\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
764 @deftypefn {Built-in Function} {} argnames (@var{fun})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
765 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
766 the arguments of the inline function @var{fun}.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
767 @end deftypefn\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
768 @seealso{argnames, inline, formula, vectorize}")
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
769 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
770 octave_value retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
771
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
772 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
773
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
774 if (nargin == 1)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
775 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
776 octave_fcn_inline *fn = args(0).fcn_inline_value (true);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
777
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
778 if (fn)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
779 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
780 string_vector t1 = fn->fcn_arg_names ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
781
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
782 Cell t2 (dim_vector (t1.length (), 1));
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
783
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
784 for (int i = 0; i < t1.length (); i++)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
785 t2(i) = t1(i);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
786
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
787 retval = t2;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
788 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
789 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
790 error ("argnames: argument must be an inline function");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
791 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
792 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
793 print_usage ("argnames");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
794
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
795 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
796 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
797
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
798 DEFUN (vectorize, args, ,
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
799 "-*- texinfo -*-\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
800 @deftypefn {Built-in Function} {} argnames (@var{fun})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
801 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
802 by replacing all occurrences of @code{*}, @code{/}, etc., with\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
803 @code{.*}, @code{./}, etc.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
804 @end deftypefn\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
805 @seealso{argnames, inline, formula, vectorize}")
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
806 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
807 octave_value retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
808
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
809 int nargin = args.length ();
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
810
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
811 if (nargin == 1)
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
812 {
5409
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
813 std::string old_func;
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
814 octave_fcn_inline* old = 0;
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
815 bool func_is_string = true;
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
816
5409
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
817 if (args(0).is_string ())
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
818 old_func = args(0).string_value ();
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
819 else
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
820 {
5409
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
821 old = args(0).fcn_inline_value (true);
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
822 func_is_string = false;
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
823
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
824 if (old)
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
825 old_func = old->fcn_text ();
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
826 else
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
827 error ("vectorize: must be a string or inline function");
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
828 }
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
829
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
830 if (! error_state)
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
831 {
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
832 std::string new_func;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
833 size_t i = 0;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
834
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
835 while (i < old_func.length ())
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
836 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
837 std::string t1 = old_func.substr (i, 1);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
838
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
839 if (t1 == "*" || t1 == "/" || t1 == "\\" || t1 == "^")
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
840 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
841 if (i && old_func.substr (i-1, 1) != ".")
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
842 new_func.append (".");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
843
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
844 // Special case for ** operator.
4973
c969a018c928 [project @ 2004-09-08 17:07:11 by jwe]
jwe
parents: 4972
diff changeset
845 if (t1 == "*" && i < (old_func.length () - 1)
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
846 && old_func.substr (i+1, 1) == "*")
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
847 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
848 new_func.append ("*");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
849 i++;
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 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
852 new_func.append (t1);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
853 i++;
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
5409
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
856 if (func_is_string)
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
857 retval = octave_value (new_func);
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
858 else
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
859 retval = octave_value (new octave_fcn_inline
fda074a55b5c [project @ 2005-07-11 08:41:16 by dbateman]
dbateman
parents: 5307
diff changeset
860 (new_func, old->fcn_arg_names ()));
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
861 }
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 else
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
864 print_usage ("vectorize");
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
865
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
866 return retval;
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
867 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
868
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
869 /*
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
870 ;;; Local Variables: ***
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
871 ;;; mode: C++ ***
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
872 ;;; End: ***
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents:
diff changeset
873 */