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