Mercurial > hg > octave-lyh
annotate libinterp/interpfcn/load-save.cc @ 16555:04fb96f4bea1
allow double-click in file browser to load data files
* files-dock-widget.cc (files_dock_widget::display_directory): If file
looks like Octave data file, load it instead of opening with editor.
* ls-mat-ascii.h, ls-mat-ascii.cc (get_lines_and_columns): New option
to supress error messages. New option to check for numeric values.
(looks_like_mat_ascii_file): New function.
* load-save.h load-save.cc (is_octave_data_file): New function.
(get_file_format): Don't return LS_MAT_ASCII unless the file really
looks like it is a numeric data file.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 23 Apr 2013 12:57:16 -0400 |
| parents | 302157614308 |
| children | b04ae15530fc |
| rev | line source |
|---|---|
| 6763 | 1 /* |
| 604 | 2 |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14047
diff
changeset
|
3 Copyright (C) 1994-2012 John W. Eaton |
| 604 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 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 | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 604 | 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. | |
| 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/>. | |
| 604 | 20 |
| 21 */ | |
| 22 | |
| 3911 | 23 // Author: John W. Eaton. |
| 24 // HDF5 support by Steven G. Johnson <stevenj@alum.mit.edu> | |
| 25 // Matlab v5 support by James R. Van Zandt <jrv@vanzandt.mv.com> | |
| 3687 | 26 |
| 604 | 27 #ifdef HAVE_CONFIG_H |
| 1192 | 28 #include <config.h> |
| 604 | 29 #endif |
| 30 | |
| 1343 | 31 #include <cfloat> |
| 32 #include <cstring> | |
| 33 #include <cctype> | |
| 34 | |
| 4249 | 35 #include <fstream> |
| 3503 | 36 #include <iomanip> |
| 37 #include <iostream> | |
| 5765 | 38 #include <sstream> |
| 1728 | 39 #include <string> |
| 40 | |
| 9946 | 41 #include "strftime.h" |
| 42 | |
| 1961 | 43 #include "byte-swap.h" |
| 44 #include "data-conv.h" | |
| 2926 | 45 #include "file-ops.h" |
| 6159 | 46 #include "file-stat.h" |
| 2926 | 47 #include "glob-match.h" |
| 2890 | 48 #include "lo-mappers.h" |
| 2318 | 49 #include "mach-info.h" |
| 3185 | 50 #include "oct-env.h" |
| 3258 | 51 #include "oct-time.h" |
| 4171 | 52 #include "quit.h" |
| 1755 | 53 #include "str-vec.h" |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8110
diff
changeset
|
54 #include "oct-locbuf.h" |
| 1755 | 55 |
| 4332 | 56 #include "Cell.h" |
| 1352 | 57 #include "defun.h" |
| 604 | 58 #include "error.h" |
| 777 | 59 #include "gripes.h" |
| 6159 | 60 #include "load-path.h" |
| 1352 | 61 #include "load-save.h" |
| 1750 | 62 #include "oct-obj.h" |
| 3687 | 63 #include "oct-map.h" |
| 4332 | 64 #include "ov-cell.h" |
| 1352 | 65 #include "pager.h" |
| 1750 | 66 #include "pt-exp.h" |
| 1352 | 67 #include "symtab.h" |
| 68 #include "sysdep.h" | |
| 69 #include "unwind-prot.h" | |
| 604 | 70 #include "utils.h" |
| 2371 | 71 #include "variables.h" |
| 3185 | 72 #include "version.h" |
| 3688 | 73 #include "dMatrix.h" |
| 74 | |
| 4633 | 75 #include "ls-hdf5.h" |
| 76 #include "ls-mat-ascii.h" | |
| 77 #include "ls-mat4.h" | |
| 78 #include "ls-mat5.h" | |
| 79 #include "ls-oct-ascii.h" | |
| 80 #include "ls-oct-binary.h" | |
| 3688 | 81 |
| 10309 | 82 // Remove gnulib definitions, if any. |
| 83 #ifdef close | |
| 84 #undef close | |
| 85 #endif | |
| 86 #ifdef open | |
| 87 #undef open | |
| 5269 | 88 #endif |
| 89 | |
| 10309 | 90 #ifdef HAVE_ZLIB |
| 91 #include "zfstream.h" | |
|
10305
d6cdf08d0424
load-save.cc: avoid gnulib definition of close
John W. Eaton <jwe@octave.org>
parents:
10250
diff
changeset
|
92 #endif |
|
d6cdf08d0424
load-save.cc: avoid gnulib definition of close
John W. Eaton <jwe@octave.org>
parents:
10250
diff
changeset
|
93 |
|
14889
577df411e0c7
rename octave-core file to octave-workspace
John W. Eaton <jwe@octave.org>
parents:
14861
diff
changeset
|
94 // Write octave-workspace file if Octave crashes or is killed by a signal. |
| 5794 | 95 static bool Vcrash_dumps_octave_core = true; |
| 3189 | 96 |
| 4791 | 97 // The maximum amount of memory (in kilobytes) that we will attempt to |
| 98 // write to the Octave core file. | |
| 5794 | 99 static double Voctave_core_file_limit = -1.0; |
| 4791 | 100 |
| 101 // The name of the Octave core file. | |
|
14889
577df411e0c7
rename octave-core file to octave-workspace
John W. Eaton <jwe@octave.org>
parents:
14861
diff
changeset
|
102 static std::string Voctave_core_file_name = "octave-workspace"; |
| 4791 | 103 |
| 3687 | 104 // The default output format. May be one of "binary", "text", |
| 105 // "mat-binary", or "hdf5". | |
| 5794 | 106 static std::string Vdefault_save_options = "-text"; |
| 2194 | 107 |
| 5284 | 108 // The output format for Octave core files. |
| 5794 | 109 static std::string Voctave_core_file_options = "-binary"; |
| 110 | |
| 111 static std::string | |
| 112 default_save_header_format (void) | |
| 113 { | |
| 114 return | |
| 115 std::string ("# Created by Octave " OCTAVE_VERSION | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
116 ", %a %b %d %H:%M:%S %Y %Z <") |
| 5794 | 117 + octave_env::get_user_name () |
| 118 + std::string ("@") | |
| 119 + octave_env::get_host_name () | |
| 120 + std::string (">"); | |
| 121 } | |
| 4788 | 122 |
| 3709 | 123 // The format string for the comment line at the top of text-format |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
124 // save files. Passed to strftime. Should begin with '#' and contain |
| 3709 | 125 // no newline characters. |
| 5794 | 126 static std::string Vsave_header_format_string = default_save_header_format (); |
| 3709 | 127 |
| 5369 | 128 static void |
| 129 gripe_file_open (const std::string& fcn, const std::string& file) | |
| 130 { | |
| 131 if (fcn == "load") | |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
132 error ("%s: unable to open input file '%s'", fcn.c_str (), file.c_str ()); |
| 5369 | 133 else if (fcn == "save") |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
134 error ("%s: unable to open output file '%s'", fcn.c_str (), file.c_str ()); |
| 5369 | 135 else |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
136 error ("%s: unable to open file '%s'", fcn.c_str (), file.c_str ()); |
| 5369 | 137 } |
| 138 | |
| 7336 | 139 // Install a variable with name NAME and the value VAL in the |
| 140 // symbol table. If GLOBAL is TRUE, make the variable global. | |
| 604 | 141 |
| 142 static void | |
| 7336 | 143 install_loaded_variable (const std::string& name, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
144 const octave_value& val, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
145 bool global, const std::string& /*doc*/) |
| 604 | 146 { |
| 147 if (global) | |
| 148 { | |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
15571
diff
changeset
|
149 symbol_table::clear (name); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
15571
diff
changeset
|
150 symbol_table::mark_global (name); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
15571
diff
changeset
|
151 symbol_table::global_assign (name, val); |
| 604 | 152 } |
| 153 else | |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
15571
diff
changeset
|
154 symbol_table::assign (name, val); |
| 604 | 155 } |
| 156 | |
| 3019 | 157 // Return TRUE if NAME matches one of the given globbing PATTERNS. |
| 604 | 158 |
| 3013 | 159 static bool |
| 3769 | 160 matches_patterns (const string_vector& patterns, int pat_idx, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
161 int num_pat, const std::string& name) |
| 604 | 162 { |
| 1755 | 163 for (int i = pat_idx; i < num_pat; i++) |
| 604 | 164 { |
| 1792 | 165 glob_match pattern (patterns[i]); |
| 3013 | 166 |
| 1792 | 167 if (pattern.match (name)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
168 return true; |
| 604 | 169 } |
| 3688 | 170 |
| 3013 | 171 return false; |
| 604 | 172 } |
| 173 | |
| 4329 | 174 int |
| 3523 | 175 read_binary_file_header (std::istream& is, bool& swap, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
176 oct_mach_info::float_format& flt_fmt, bool quiet) |
| 604 | 177 { |
| 3552 | 178 const int magic_len = 10; |
| 179 char magic[magic_len+1]; | |
| 5760 | 180 is.read (magic, magic_len); |
| 604 | 181 magic[magic_len] = '\0'; |
| 3688 | 182 |
| 604 | 183 if (strncmp (magic, "Octave-1-L", magic_len) == 0) |
| 2318 | 184 swap = oct_mach_info::words_big_endian (); |
| 604 | 185 else if (strncmp (magic, "Octave-1-B", magic_len) == 0) |
| 2318 | 186 swap = ! oct_mach_info::words_big_endian (); |
| 604 | 187 else |
| 188 { | |
| 189 if (! quiet) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
190 error ("load: unable to read read binary file"); |
| 604 | 191 return -1; |
| 192 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
193 |
| 604 | 194 char tmp = 0; |
| 5760 | 195 is.read (&tmp, 1); |
| 604 | 196 |
| 2318 | 197 flt_fmt = mopt_digit_to_float_format (tmp); |
| 198 | |
| 4574 | 199 if (flt_fmt == oct_mach_info::flt_fmt_unknown) |
| 604 | 200 { |
| 201 if (! quiet) | |
| 202 error ("load: unrecognized binary format!"); | |
| 3688 | 203 |
| 604 | 204 return -1; |
| 205 } | |
| 206 | |
| 207 return 0; | |
| 208 } | |
| 209 | |
| 5269 | 210 #ifdef HAVE_ZLIB |
| 211 static bool | |
| 212 check_gzip_magic (const std::string& fname) | |
| 213 { | |
| 214 bool retval = false; | |
| 215 std::ifstream file (fname.c_str ()); | |
| 216 OCTAVE_LOCAL_BUFFER (unsigned char, magic, 2); | |
| 217 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
218 if (file.read (reinterpret_cast<char *> (magic), 2) && magic[0] == 0x1f && |
| 5269 | 219 magic[1] == 0x8b) |
| 220 retval = true; | |
| 221 | |
| 222 file.close (); | |
| 223 return retval; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
224 } |
| 5269 | 225 #endif |
| 226 | |
| 604 | 227 static load_save_format |
| 6625 | 228 get_file_format (std::istream& file, const std::string& filename) |
| 604 | 229 { |
| 230 load_save_format retval = LS_UNKNOWN; | |
| 231 | |
| 4574 | 232 oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown; |
| 604 | 233 |
| 3019 | 234 bool swap = false; |
| 235 | |
| 236 if (read_binary_file_header (file, swap, flt_fmt, true) == 0) | |
| 604 | 237 retval = LS_BINARY; |
| 238 else | |
| 239 { | |
| 6202 | 240 file.clear (); |
| 3538 | 241 file.seekg (0, std::ios::beg); |
| 604 | 242 |
| 5828 | 243 int32_t mopt, nr, nc, imag, len; |
| 1180 | 244 |
|
16555
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
245 int err = read_mat_file_header (file, swap, mopt, nr, nc, imag, len, |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
246 true); |
| 1180 | 247 |
| 248 if (! err) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
249 retval = LS_MAT_BINARY; |
| 604 | 250 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
251 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
252 file.clear (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
253 file.seekg (0, std::ios::beg); |
| 604 | 254 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
255 err = read_mat5_binary_file_header (file, swap, true, filename); |
| 3688 | 256 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
257 if (! err) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
258 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
259 file.clear (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
260 file.seekg (0, std::ios::beg); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
261 retval = LS_MAT5_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
262 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
263 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
264 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
265 file.clear (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
266 file.seekg (0, std::ios::beg); |
| 3688 | 267 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
268 std::string tmp = extract_keyword (file, "name"); |
| 4171 | 269 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
270 if (! tmp.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
271 retval = LS_ASCII; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
272 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
273 } |
| 604 | 274 } |
| 275 | |
| 5269 | 276 return retval; |
| 277 } | |
| 5977 | 278 |
| 5269 | 279 static load_save_format |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
280 get_file_format (const std::string& fname, const std::string& orig_fname, |
|
16555
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
281 bool &use_zlib, bool quiet = false) |
| 5269 | 282 { |
| 283 load_save_format retval = LS_UNKNOWN; | |
| 284 | |
| 285 #ifdef HAVE_HDF5 | |
| 286 // check this before we open the file | |
| 287 if (H5Fis_hdf5 (fname.c_str ()) > 0) | |
| 288 return LS_HDF5; | |
| 289 #endif /* HAVE_HDF5 */ | |
| 604 | 290 |
| 5269 | 291 std::ifstream file (fname.c_str ()); |
| 292 use_zlib = false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
293 |
| 5269 | 294 if (file) |
| 295 { | |
| 6625 | 296 retval = get_file_format (file, orig_fname); |
| 5269 | 297 file.close (); |
| 5977 | 298 |
| 5383 | 299 #ifdef HAVE_ZLIB |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
300 if (retval == LS_UNKNOWN && check_gzip_magic (fname)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
301 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
302 gzifstream gzfile (fname.c_str ()); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
303 use_zlib = true; |
| 5269 | 304 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
305 if (gzfile) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
306 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
307 retval = get_file_format (gzfile, orig_fname); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
308 gzfile.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
309 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
310 } |
| 5977 | 311 #endif |
| 5269 | 312 |
|
16555
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
313 // FIXME -- looks_like_mat_ascii_file does not check to see |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
314 // whether the file contains numbers. It just skips comments and |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
315 // checks for the same number of words on each line. We may need |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
316 // a better check here. The best way to do that might be just |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
317 // to try to read the file and see if it works. |
| 5269 | 318 |
|
16555
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
319 if (retval == LS_UNKNOWN && looks_like_mat_ascii_file (fname)) |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
320 retval = LS_MAT_ASCII; |
| 5269 | 321 } |
|
16555
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
322 else if (! quiet) |
| 5369 | 323 gripe_file_open ("load", orig_fname); |
| 604 | 324 |
| 325 return retval; | |
| 326 } | |
| 327 | |
| 4329 | 328 octave_value |
| 7336 | 329 do_load (std::istream& stream, const std::string& orig_fname, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
330 load_save_format format, oct_mach_info::float_format flt_fmt, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
331 bool list_only, bool swap, bool verbose, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
332 const string_vector& argv, int argv_idx, int argc, int nargout) |
| 604 | 333 { |
| 3727 | 334 octave_value retval; |
| 335 | |
|
11059
4ffa19147604
replace Octave_map->octave_scalar_map in help.cc and load-save.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10846
diff
changeset
|
336 octave_scalar_map retstruct; |
| 604 | 337 |
| 5765 | 338 std::ostringstream output_buf; |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
339 std::list<std::string> symbol_names; |
| 4051 | 340 |
| 5754 | 341 octave_idx_type count = 0; |
| 4051 | 342 |
| 604 | 343 for (;;) |
| 344 { | |
| 3019 | 345 bool global = false; |
| 2086 | 346 octave_value tc; |
| 604 | 347 |
| 4171 | 348 std::string name; |
| 349 std::string doc; | |
| 604 | 350 |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
351 switch (format.type) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
352 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
353 case LS_ASCII: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
354 name = read_ascii_data (stream, orig_fname, global, tc, count); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
355 break; |
| 604 | 356 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
357 case LS_BINARY: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
358 name = read_binary_data (stream, swap, flt_fmt, orig_fname, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
359 global, tc, doc); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
360 break; |
| 604 | 361 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
362 case LS_MAT_ASCII: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
363 name = read_mat_ascii_data (stream, orig_fname, tc); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
364 break; |
| 2511 | 365 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
366 case LS_MAT_BINARY: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
367 name = read_mat_binary_data (stream, orig_fname, tc); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
368 break; |
| 604 | 369 |
| 3687 | 370 #ifdef HAVE_HDF5 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
371 case LS_HDF5: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
372 name = read_hdf5_data (stream, orig_fname, global, tc, doc); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
373 break; |
| 3687 | 374 #endif /* HAVE_HDF5 */ |
| 375 | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
376 case LS_MAT5_BINARY: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
377 case LS_MAT7_BINARY: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
378 name = read_mat5_binary_element (stream, orig_fname, swap, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
379 global, tc); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
380 break; |
| 3688 | 381 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
382 default: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
383 gripe_unrecognized_data_fmt ("load"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
384 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
385 } |
| 604 | 386 |
| 4171 | 387 if (error_state || stream.eof () || name.empty ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
388 break; |
| 4171 | 389 else if (! error_state && ! name.empty ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
390 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
391 if (tc.is_defined ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
392 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
393 if (format == LS_MAT_ASCII && argv_idx < argc) |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
394 warning ("load: loaded ASCII file '%s' -- ignoring extra args", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
395 orig_fname.c_str ()); |
| 3136 | 396 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
397 if (format == LS_MAT_ASCII |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
398 || argv_idx == argc |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
399 || matches_patterns (argv, argv_idx, argc, name)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
400 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
401 count++; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
402 if (list_only) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
403 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
404 if (verbose) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
405 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
406 if (count == 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
407 output_buf |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
408 << "type rows cols name\n" |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
409 << "==== ==== ==== ====\n"; |
| 621 | 410 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
411 output_buf |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
412 << std::setiosflags (std::ios::left) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
413 << std::setw (16) << tc.type_name () . c_str () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
414 << std::setiosflags (std::ios::right) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
415 << std::setw (7) << tc.rows () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
416 << std::setw (7) << tc.columns () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
417 << " " << name << "\n"; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
418 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
419 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
420 symbol_names.push_back (name); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
421 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
422 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
423 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
424 if (nargout == 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
425 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
426 if (format == LS_MAT_ASCII) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
427 retval = tc; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
428 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
429 retstruct.assign (name, tc); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
430 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
431 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
432 install_loaded_variable (name, tc, global, doc); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
433 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
434 } |
| 2511 | 435 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
436 // Only attempt to read one item from a headless text file. |
| 2511 | 437 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
438 if (format == LS_MAT_ASCII) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
439 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
440 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
441 else |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
442 error ("load: unable to load variable '%s'", name.c_str ()); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
443 } |
| 604 | 444 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
445 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
446 if (count == 0) |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
447 error ("load: are you sure '%s' is an Octave data file?", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
448 orig_fname.c_str ()); |
| 604 | 449 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
450 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
451 } |
| 604 | 452 } |
| 453 | |
| 621 | 454 if (list_only && count) |
| 455 { | |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
456 if (verbose) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
457 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
458 std::string msg = output_buf.str (); |
| 2095 | 459 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
460 if (nargout > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
461 retval = msg; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
462 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
463 octave_stdout << msg; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
464 } |
| 621 | 465 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
466 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
467 if (nargout > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
468 retval = Cell (string_vector (symbol_names)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
469 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
470 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
471 string_vector names (symbol_names); |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
472 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
473 names.list_in_columns (octave_stdout); |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
474 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
475 octave_stdout << "\n"; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
476 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
477 } |
| 621 | 478 } |
| 6639 | 479 else if (retstruct.nfields () != 0) |
| 3727 | 480 retval = retstruct; |
| 621 | 481 |
| 863 | 482 return retval; |
| 483 } | |
| 484 | |
| 6159 | 485 std::string |
| 486 find_file_to_load (const std::string& name, const std::string& orig_name) | |
| 487 { | |
| 488 std::string fname = name; | |
| 489 | |
| 6838 | 490 if (! (octave_env::absolute_pathname (fname) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
491 || octave_env::rooted_relative_pathname (fname))) |
| 6159 | 492 { |
| 493 file_stat fs (fname); | |
| 494 | |
| 6584 | 495 if (! (fs.exists () && fs.is_reg ())) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
496 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
497 std::string tmp |
| 10250 | 498 = octave_env::make_absolute (load_path::find_file (fname)); |
| 6159 | 499 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
500 if (! tmp.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
501 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
502 warning_with_id ("Octave:load-file-in-path", |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
503 "load: file found in load path"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
504 fname = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
505 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
506 } |
| 6159 | 507 } |
| 508 | |
| 6838 | 509 size_t dot_pos = fname.rfind ("."); |
|
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
7819
diff
changeset
|
510 size_t sep_pos = fname.find_last_of (file_ops::dir_sep_chars ()); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
511 |
| 8021 | 512 if (dot_pos == std::string::npos |
| 513 || (sep_pos != std::string::npos && dot_pos < sep_pos)) | |
| 6159 | 514 { |
| 6838 | 515 // Either no '.' in name or no '.' appears after last directory |
| 516 // separator. | |
| 517 | |
| 6159 | 518 file_stat fs (fname); |
| 519 | |
| 6584 | 520 if (! (fs.exists () && fs.is_reg ())) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
521 fname = find_file_to_load (fname + ".mat", orig_name); |
| 6159 | 522 } |
| 523 else | |
| 524 { | |
| 525 file_stat fs (fname); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
526 |
| 6584 | 527 if (! (fs.exists () && fs.is_reg ())) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
528 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
529 fname = ""; |
| 6159 | 530 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
531 error ("load: unable to find file %s", orig_name.c_str ()); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
532 } |
| 6159 | 533 } |
| 534 | |
| 535 return fname; | |
| 536 } | |
| 537 | |
|
16555
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
538 bool |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
539 is_octave_data_file (const std::string& fname) |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
540 { |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
541 bool use_zlib = false; |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
542 return get_file_format (fname, fname, use_zlib, true) != LS_UNKNOWN; |
|
04fb96f4bea1
allow double-click in file browser to load data files
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
543 } |
| 6159 | 544 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8676
diff
changeset
|
545 DEFUN (load, args, nargout, |
| 3372 | 546 "-*- texinfo -*-\n\ |
|
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11547
diff
changeset
|
547 @deftypefn {Command} {} load file\n\ |
| 11547 | 548 @deftypefnx {Command} {} load options file\n\ |
| 549 @deftypefnx {Command} {} load options file v1 v2 @dots{}\n\ | |
|
12216
becaa4b96728
load-save.cc (Fload): fix texinfo markup
John W. Eaton <jwe@octave.org>
parents:
12160
diff
changeset
|
550 @deftypefnx {Command} {S =} load (\"options\", \"file\", \"v1\", \"v2\", @dots{})\n\ |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
551 @deftypefnx {Command} {} load file options\n\ |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
552 @deftypefnx {Command} {} load file options v1 v2 @dots{}\n\ |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
553 @deftypefnx {Command} {S =} load (\"file\", \"options\", \"v1\", \"v2\", @dots{})\n\ |
| 7247 | 554 Load the named variables @var{v1}, @var{v2}, @dots{}, from the file\n\ |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
555 @var{file}. If no variables are specified then all variables found in the\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
556 file will be loaded. As with @code{save}, the list of variables to extract\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
557 can be full names or use a pattern syntax. The format of the file is\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
558 automatically detected but may be overridden by supplying the appropriate\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
559 option.\n\ |
| 863 | 560 \n\ |
| 5665 | 561 If load is invoked using the functional form\n\ |
| 562 \n\ | |
| 563 @example\n\ | |
| 7247 | 564 load (\"-option1\", @dots{}, \"file\", \"v1\", @dots{})\n\ |
| 5665 | 565 @end example\n\ |
| 566 \n\ | |
| 567 @noindent\n\ | |
| 568 then the @var{options}, @var{file}, and variable name arguments\n\ | |
| 569 (@var{v1}, @dots{}) must be specified as character strings.\n\ | |
| 570 \n\ | |
| 3372 | 571 If a variable that is not marked as global is loaded from a file when a\n\ |
| 572 global symbol with the same name already exists, it is loaded in the\n\ | |
| 573 global symbol table. Also, if a variable is marked as global in a file\n\ | |
| 574 and a local symbol exists, the local symbol is moved to the global\n\ | |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
575 symbol table and given the value from the file.\n\ |
| 863 | 576 \n\ |
| 3727 | 577 If invoked with a single output argument, Octave returns data instead\n\ |
| 578 of inserting variables in the symbol table. If the data file contains\n\ | |
| 579 only numbers (TAB- or space-delimited columns), a matrix of values is\n\ | |
| 580 returned. Otherwise, @code{load} returns a structure with members\n\ | |
| 581 corresponding to the names of the variables in the file.\n\ | |
| 582 \n\ | |
| 3372 | 583 The @code{load} command can read data stored in Octave's text and\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9039
diff
changeset
|
584 binary formats, and @sc{matlab}'s binary format. If compiled with zlib\n\ |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
585 support, it can also load gzip-compressed files. It will automatically\n\ |
| 3372 | 586 detect the type of file and do conversion from different floating point\n\ |
| 587 formats (currently only IEEE big and little endian, though other formats\n\ | |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
588 may be added in the future).\n\ |
| 3372 | 589 \n\ |
| 590 Valid options for @code{load} are listed in the following table.\n\ | |
| 863 | 591 \n\ |
| 3372 | 592 @table @code\n\ |
| 593 @item -force\n\ | |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
594 This option is accepted for backward compatibility but is ignored.\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
595 Octave now overwrites variables currently in memory with\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
596 those of the same name found in the file.\n\ |
| 3372 | 597 \n\ |
| 598 @item -ascii\n\ | |
| 5938 | 599 Force Octave to assume the file contains columns of numbers in text format\n\ |
| 600 without any header or other information. Data in the file will be loaded\n\ | |
| 601 as a single numeric matrix with the name of the variable derived from the\n\ | |
| 602 name of the file.\n\ | |
| 5197 | 603 \n\ |
| 3372 | 604 @item -binary\n\ |
| 605 Force Octave to assume the file is in Octave's binary format.\n\ | |
| 606 \n\ | |
| 3687 | 607 @item -hdf5\n\ |
| 10840 | 608 Force Octave to assume the file is in @sc{hdf5} format.\n\ |
|
12160
b64b82721062
Make documentation static by removing docstrings depending on #ifdef variables
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
609 (@sc{hdf5} is a free, portable binary format developed by the National\n\ |
| 3687 | 610 Center for Supercomputing Applications at the University of Illinois.)\n\ |
| 10840 | 611 Note that Octave can read @sc{hdf5} files not created by itself, but may\n\ |
|
12160
b64b82721062
Make documentation static by removing docstrings depending on #ifdef variables
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
612 skip some datasets in formats that it cannot support. This format is\n\ |
|
b64b82721062
Make documentation static by removing docstrings depending on #ifdef variables
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
613 only available if Octave was built with a link to the @sc{hdf5} libraries.\n\ |
|
b64b82721062
Make documentation static by removing docstrings depending on #ifdef variables
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
614 \n\ |
| 3687 | 615 @item -import\n\ |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
616 This option is accepted for backward compatibility but is ignored.\n\ |
| 4884 | 617 Octave can now support multi-dimensional HDF data and automatically\n\ |
| 618 modifies variable names if they are invalid Octave identifiers.\n\ | |
| 3687 | 619 \n\ |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
620 @item -mat\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
621 @itemx -mat-binary\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
622 @itemx -6\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
623 @itemx -v6\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
624 @itemx -7\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
625 @itemx -v7\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
626 Force Octave to assume the file is in @sc{matlab}'s version 6 or 7 binary\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
627 format.\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
628 \n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
629 @item -mat4-binary\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
630 @itemx -4\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
631 @itemx -v4\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
632 @itemx -V4\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
633 Force Octave to assume the file is in the binary format written by\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
634 @sc{matlab} version 4.\n\ |
|
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
635 \n\ |
| 5198 | 636 @item -text\n\ |
| 5197 | 637 Force Octave to assume the file is in Octave's text format.\n\ |
| 3372 | 638 @end table\n\ |
|
9306
de124edcebf6
Update documentation for load and save
Rik <rdrider0-list@yahoo.com>
parents:
9153
diff
changeset
|
639 @seealso{save, dlmwrite, csvwrite, fwrite}\n\ |
| 11547 | 640 @end deftypefn") |
| 863 | 641 { |
| 2086 | 642 octave_value_list retval; |
| 863 | 643 |
| 1755 | 644 int argc = args.length () + 1; |
| 645 | |
| 1968 | 646 string_vector argv = args.make_argv ("load"); |
| 1755 | 647 |
| 648 if (error_state) | |
| 649 return retval; | |
| 863 | 650 |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
651 int i = 1; |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
652 std::string orig_fname = ""; |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
653 |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
654 // Function called with Matlab-style ["filename", options] syntax |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14366
diff
changeset
|
655 if (argc > 1 && ! argv[1].empty () && argv[1].at (0) != '-') |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
656 { |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
657 orig_fname = argv[1]; |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
658 i++; |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
659 } |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
660 |
| 1358 | 661 // It isn't necessary to have the default load format stored in a |
| 662 // user preference variable since we can determine the type of file | |
| 663 // as we are reading. | |
| 863 | 664 |
| 665 load_save_format format = LS_UNKNOWN; | |
| 666 | |
| 3019 | 667 bool list_only = false; |
| 668 bool verbose = false; | |
| 863 | 669 |
|
13026
9a2a6054460f
maint: Fix 2 compiler warnings
Rik <octave@nomad.inbox5.com>
parents:
12895
diff
changeset
|
670 //for (i; i < argc; i++) |
|
9a2a6054460f
maint: Fix 2 compiler warnings
Rik <octave@nomad.inbox5.com>
parents:
12895
diff
changeset
|
671 for (; i < argc; i++) |
| 863 | 672 { |
| 1755 | 673 if (argv[i] == "-force" || argv[i] == "-f") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
674 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
675 // Silently ignore this |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
676 // warning ("load: -force ignored"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
677 } |
| 1755 | 678 else if (argv[i] == "-list" || argv[i] == "-l") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
679 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
680 list_only = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
681 } |
| 1755 | 682 else if (argv[i] == "-verbose" || argv[i] == "-v") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
683 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
684 verbose = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
685 } |
| 1755 | 686 else if (argv[i] == "-ascii" || argv[i] == "-a") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
687 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
688 format = LS_MAT_ASCII; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
689 } |
| 1755 | 690 else if (argv[i] == "-binary" || argv[i] == "-b") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
691 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
692 format = LS_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
693 } |
| 5269 | 694 else if (argv[i] == "-mat-binary" || argv[i] == "-mat" || argv[i] == "-m" |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
695 || argv[i] == "-6" || argv[i] == "-v6") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
696 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
697 format = LS_MAT5_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
698 } |
|
7819
b7e8ea6a5143
trivial fix option in Fload
Jaroslav Hajek <highegg@gmail.com>
parents:
7779
diff
changeset
|
699 else if (argv[i] == "-7" || argv[i] == "-v7") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
700 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
701 format = LS_MAT7_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
702 } |
| 5256 | 703 else if (argv[i] == "-mat4-binary" || argv[i] == "-V4" |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
704 || argv[i] == "-v4" || argv[i] == "-4") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
705 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
706 format = LS_MAT_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
707 } |
| 3687 | 708 else if (argv[i] == "-hdf5" || argv[i] == "-h") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
709 { |
| 3687 | 710 #ifdef HAVE_HDF5 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
711 format = LS_HDF5; |
| 3687 | 712 #else /* ! HAVE_HDF5 */ |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
713 error ("load: octave executable was not linked with HDF5 library"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
714 return retval; |
| 3687 | 715 #endif /* ! HAVE_HDF5 */ |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
716 } |
| 3687 | 717 else if (argv[i] == "-import" || argv[i] == "-i") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
718 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
719 warning ("load: -import ignored"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
720 } |
| 5197 | 721 else if (argv[i] == "-text" || argv[i] == "-t") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
722 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
723 format = LS_ASCII; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
724 } |
| 863 | 725 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
726 break; |
| 863 | 727 } |
| 728 | |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
729 if (orig_fname == "") |
| 863 | 730 { |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
731 if (i == argc) |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
732 { |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
733 print_usage (); |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
734 return retval; |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
735 } |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
736 else |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
737 orig_fname = argv[i]; |
| 863 | 738 } |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
739 else |
|
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
740 i--; |
| 863 | 741 |
| 4574 | 742 oct_mach_info::float_format flt_fmt = oct_mach_info::flt_fmt_unknown; |
| 863 | 743 |
| 3019 | 744 bool swap = false; |
| 863 | 745 |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
746 if (orig_fname == "-") |
| 863 | 747 { |
| 1755 | 748 i++; |
| 863 | 749 |
| 3687 | 750 #ifdef HAVE_HDF5 |
| 751 if (format == LS_HDF5) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
752 error ("load: cannot read HDF5 format from stdin"); |
| 3687 | 753 else |
| 754 #endif /* HAVE_HDF5 */ | |
| 863 | 755 if (format != LS_UNKNOWN) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
756 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
757 // FIXME -- if we have already seen EOF on a |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
758 // previous call, how do we fix up the state of std::cin so |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
759 // that we can get additional input? I'm afraid that we |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
760 // can't fix this using std::cin only. |
| 3531 | 761 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
762 retval = do_load (std::cin, orig_fname, format, flt_fmt, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
763 list_only, swap, verbose, argv, i, argc, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
764 nargout); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
765 } |
| 863 | 766 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
767 error ("load: must specify file format if reading from stdin"); |
| 863 | 768 } |
| 769 else | |
| 770 { | |
|
12895
8edece28cf4d
Allow Matlab-style syntax for load command (Bug #33527).
Rik <octave@nomad.inbox5.com>
parents:
12661
diff
changeset
|
771 std::string fname = file_ops::tilde_expand (orig_fname); |
| 6159 | 772 |
| 773 fname = find_file_to_load (fname, orig_fname); | |
| 863 | 774 |
| 6159 | 775 if (error_state) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
776 return retval; |
| 6159 | 777 |
| 778 bool use_zlib = false; | |
| 5089 | 779 |
| 863 | 780 if (format == LS_UNKNOWN) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
781 format = get_file_format (fname, orig_fname, use_zlib); |
| 863 | 782 |
| 3687 | 783 #ifdef HAVE_HDF5 |
| 784 if (format == LS_HDF5) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
785 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
786 i++; |
| 3687 | 787 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
788 hdf5_ifstream hdf5_file (fname.c_str ()); |
| 3687 | 789 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
790 if (hdf5_file.file_id >= 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
791 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
792 retval = do_load (hdf5_file, orig_fname, format, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
793 flt_fmt, list_only, swap, verbose, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
794 argv, i, argc, nargout); |
| 4844 | 795 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
796 hdf5_file.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
797 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
798 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
799 gripe_file_open ("load", orig_fname); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
800 } |
| 3687 | 801 else |
| 802 #endif /* HAVE_HDF5 */ | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
803 // don't insert any statements here; the "else" above has to |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
804 // go with the "if" below!!!!! |
| 863 | 805 if (format != LS_UNKNOWN) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
806 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
807 i++; |
| 863 | 808 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
809 // Always open in binary mode and handle various |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
810 // line-endings explicitly. |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
811 std::ios::openmode mode = std::ios::in | std::ios::binary; |
| 863 | 812 |
| 5269 | 813 #ifdef HAVE_ZLIB |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
814 if (use_zlib) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
815 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
816 gzifstream file (fname.c_str (), mode); |
| 863 | 817 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
818 if (file) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
819 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
820 if (format == LS_BINARY) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
821 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
822 if (read_binary_file_header (file, swap, flt_fmt) < 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
823 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
824 if (file) file.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
825 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
826 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
827 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
828 else if (format == LS_MAT5_BINARY |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
829 || format == LS_MAT7_BINARY) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
830 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
831 if (read_mat5_binary_file_header (file, swap, false, orig_fname) < 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
832 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
833 if (file) file.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
834 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
835 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
836 } |
| 5269 | 837 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
838 retval = do_load (file, orig_fname, format, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
839 flt_fmt, list_only, swap, verbose, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
840 argv, i, argc, nargout); |
| 5269 | 841 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
842 file.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
843 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
844 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
845 gripe_file_open ("load", orig_fname); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
846 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
847 else |
| 5269 | 848 #endif |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
849 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
850 std::ifstream file (fname.c_str (), mode); |
| 5269 | 851 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
852 if (file) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
853 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
854 if (format == LS_BINARY) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
855 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
856 if (read_binary_file_header (file, swap, flt_fmt) < 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
857 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
858 if (file) file.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
859 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
860 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
861 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
862 else if (format == LS_MAT5_BINARY |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
863 || format == LS_MAT7_BINARY) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
864 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
865 if (read_mat5_binary_file_header (file, swap, false, orig_fname) < 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
866 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
867 if (file) file.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
868 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
869 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
870 } |
| 5269 | 871 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
872 retval = do_load (file, orig_fname, format, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
873 flt_fmt, list_only, swap, verbose, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
874 argv, i, argc, nargout); |
| 5269 | 875 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
876 file.close (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
877 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
878 else |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
879 error ("load: unable to open input file '%s'", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
880 orig_fname.c_str ()); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
881 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
882 } |
| 863 | 883 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
884 |
| 604 | 885 return retval; |
| 886 } | |
| 887 | |
| 3019 | 888 // Return TRUE if PATTERN has any special globbing chars in it. |
| 889 | |
| 890 static bool | |
| 3523 | 891 glob_pattern_p (const std::string& pattern) |
| 604 | 892 { |
| 893 int open = 0; | |
| 894 | |
| 1755 | 895 int len = pattern.length (); |
| 896 | |
| 897 for (int i = 0; i < len; i++) | |
| 604 | 898 { |
| 1755 | 899 char c = pattern[i]; |
| 900 | |
| 604 | 901 switch (c) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
902 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
903 case '?': |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
904 case '*': |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
905 return true; |
| 604 | 906 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
907 case '[': // Only accept an open brace if there is a close |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
908 open++; // brace to match it. Bracket expressions must be |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
909 continue; // complete, according to Posix.2 |
| 604 | 910 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
911 case ']': |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
912 if (open) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
913 return true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
914 continue; |
| 4402 | 915 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
916 case '\\': |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
917 if (i == len - 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
918 return false; |
| 604 | 919 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
920 default: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
921 continue; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
922 } |
| 604 | 923 } |
| 924 | |
| 3019 | 925 return false; |
| 604 | 926 } |
| 927 | |
| 4791 | 928 static void |
| 929 do_save (std::ostream& os, const octave_value& tc, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
930 const std::string& name, const std::string& help, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
931 bool global, load_save_format fmt, bool save_as_floats) |
| 604 | 932 { |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
933 switch (fmt.type) |
| 604 | 934 { |
| 935 case LS_ASCII: | |
| 6974 | 936 save_ascii_data (os, tc, name, global, 0); |
| 604 | 937 break; |
| 938 | |
| 939 case LS_BINARY: | |
| 630 | 940 save_binary_data (os, tc, name, help, global, save_as_floats); |
| 604 | 941 break; |
| 942 | |
| 5938 | 943 case LS_MAT_ASCII: |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
944 if (! save_mat_ascii_data (os, tc, fmt.opts & LS_MAT_ASCII_LONG ? 16 : 8, |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
945 fmt.opts & LS_MAT_ASCII_TABS)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
946 warning ("save: unable to save %s in ASCII format", name.c_str ()); |
| 5938 | 947 break; |
| 948 | |
| 667 | 949 case LS_MAT_BINARY: |
| 950 save_mat_binary_data (os, tc, name); | |
| 951 break; | |
| 952 | |
| 3687 | 953 #ifdef HAVE_HDF5 |
| 954 case LS_HDF5: | |
| 955 save_hdf5_data (os, tc, name, help, global, save_as_floats); | |
| 956 break; | |
| 957 #endif /* HAVE_HDF5 */ | |
| 958 | |
| 3688 | 959 case LS_MAT5_BINARY: |
| 5269 | 960 save_mat5_binary_element (os, tc, name, global, false, save_as_floats); |
| 961 break; | |
| 962 | |
| 963 case LS_MAT7_BINARY: | |
| 964 save_mat5_binary_element (os, tc, name, global, true, save_as_floats); | |
| 3688 | 965 break; |
| 966 | |
| 604 | 967 default: |
| 775 | 968 gripe_unrecognized_data_fmt ("save"); |
| 604 | 969 break; |
| 970 } | |
| 971 } | |
| 972 | |
| 4791 | 973 // Save the info from SR on stream OS in the format specified by FMT. |
| 974 | |
| 975 void | |
| 7336 | 976 do_save (std::ostream& os, const symbol_table::symbol_record& sr, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
977 load_save_format fmt, bool save_as_floats) |
| 4791 | 978 { |
| 7336 | 979 octave_value val = sr.varval (); |
| 4791 | 980 |
| 7336 | 981 if (val.is_defined ()) |
| 4791 | 982 { |
| 7336 | 983 std::string name = sr.name (); |
| 984 std::string help; | |
| 985 bool global = sr.is_global (); | |
| 4791 | 986 |
| 7336 | 987 do_save (os, val, name, help, global, fmt, save_as_floats); |
| 4791 | 988 } |
| 989 } | |
| 990 | |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
991 // save fields of a scalar structure STR matching PATTERN on stream OS |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
992 // in the format specified by FMT. |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
993 |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
994 static size_t |
|
11059
4ffa19147604
replace Octave_map->octave_scalar_map in help.cc and load-save.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10846
diff
changeset
|
995 save_fields (std::ostream& os, const octave_scalar_map& m, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
996 const std::string& pattern, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
997 load_save_format fmt, bool save_as_floats) |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
998 { |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
999 glob_match pat (pattern); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1000 |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1001 size_t saved = 0; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1002 |
|
11059
4ffa19147604
replace Octave_map->octave_scalar_map in help.cc and load-save.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10846
diff
changeset
|
1003 for (octave_scalar_map::const_iterator p = m.begin (); p != m.end (); p++) |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1004 { |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1005 std::string empty_str; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1006 |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14366
diff
changeset
|
1007 if (pat.match (m.key (p))) |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1008 { |
|
11059
4ffa19147604
replace Octave_map->octave_scalar_map in help.cc and load-save.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10846
diff
changeset
|
1009 do_save (os, m.contents (p), m.key (p), empty_str, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1010 0, fmt, save_as_floats); |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1011 |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1012 saved++; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1013 } |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1014 } |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1015 |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1016 return saved; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1017 } |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1018 |
| 604 | 1019 // Save variables with names matching PATTERN on stream OS in the |
| 5794 | 1020 // format specified by FMT. |
| 604 | 1021 |
| 7336 | 1022 static size_t |
| 5794 | 1023 save_vars (std::ostream& os, const std::string& pattern, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1024 load_save_format fmt, bool save_as_floats) |
| 604 | 1025 { |
| 7336 | 1026 std::list<symbol_table::symbol_record> vars = symbol_table::glob (pattern); |
| 1027 | |
| 1028 size_t saved = 0; | |
| 3355 | 1029 |
| 7336 | 1030 typedef std::list<symbol_table::symbol_record>::const_iterator const_vars_iterator; |
| 3355 | 1031 |
| 7336 | 1032 for (const_vars_iterator p = vars.begin (); p != vars.end (); p++) |
| 620 | 1033 { |
| 7336 | 1034 do_save (os, *p, fmt, save_as_floats); |
| 620 | 1035 |
| 1036 if (error_state) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1037 break; |
| 7336 | 1038 |
| 1039 saved++; | |
| 620 | 1040 } |
| 604 | 1041 |
| 1042 return saved; | |
| 1043 } | |
| 1044 | |
|
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1045 static string_vector |
|
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1046 parse_save_options (const string_vector &argv, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1047 load_save_format &format, bool &append, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1048 bool &save_as_floats, bool &use_zlib) |
| 604 | 1049 { |
|
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1050 string_vector retval; |
|
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1051 int argc = argv.length (); |
|
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1052 |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1053 bool do_double = false, do_tabs = false; |
|
8418
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1054 |
|
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1055 for (int i = 0; i < argc; i++) |
| 5284 | 1056 { |
| 1057 if (argv[i] == "-append") | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1058 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1059 append = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1060 } |
| 5284 | 1061 else if (argv[i] == "-ascii" || argv[i] == "-a") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1062 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1063 format = LS_MAT_ASCII; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1064 } |
|
8418
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1065 else if (argv[i] == "-double") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1066 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1067 do_double = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1068 } |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1069 else if (argv[i] == "-tabs") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1070 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1071 do_tabs = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1072 } |
| 5284 | 1073 else if (argv[i] == "-text" || argv[i] == "-t") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1074 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1075 format = LS_ASCII; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1076 } |
| 5284 | 1077 else if (argv[i] == "-binary" || argv[i] == "-b") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1078 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1079 format = LS_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1080 } |
| 5284 | 1081 else if (argv[i] == "-hdf5" || argv[i] == "-h") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1082 { |
| 3687 | 1083 #ifdef HAVE_HDF5 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1084 format = LS_HDF5; |
| 5284 | 1085 #else /* ! HAVE_HDF5 */ |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1086 error ("save: octave executable was not linked with HDF5 library"); |
| 5284 | 1087 #endif /* ! HAVE_HDF5 */ |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1088 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1089 else if (argv[i] == "-mat-binary" || argv[i] == "-mat" |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1090 || argv[i] == "-m" || argv[i] == "-6" || argv[i] == "-v6" |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1091 || argv[i] == "-V6") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1092 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1093 format = LS_MAT5_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1094 } |
| 5284 | 1095 #ifdef HAVE_ZLIB |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1096 else if (argv[i] == "-mat7-binary" || argv[i] == "-7" |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1097 || argv[i] == "-v7" || argv[i] == "-V7") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1098 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1099 format = LS_MAT7_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1100 } |
| 5284 | 1101 #endif |
| 1102 else if (argv[i] == "-mat4-binary" || argv[i] == "-V4" | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1103 || argv[i] == "-v4" || argv[i] == "-4") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1104 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1105 format = LS_MAT_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1106 } |
| 5284 | 1107 else if (argv[i] == "-float-binary" || argv[i] == "-f") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1108 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1109 format = LS_BINARY; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1110 save_as_floats = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1111 } |
| 5284 | 1112 else if (argv[i] == "-float-hdf5") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1113 { |
| 5284 | 1114 #ifdef HAVE_HDF5 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1115 format = LS_HDF5; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1116 save_as_floats = true; |
| 5284 | 1117 #else /* ! HAVE_HDF5 */ |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1118 error ("save: octave executable was not linked with HDF5 library"); |
| 5284 | 1119 #endif /* ! HAVE_HDF5 */ |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1120 } |
| 5284 | 1121 #ifdef HAVE_ZLIB |
| 1122 else if (argv[i] == "-zip" || argv[i] == "-z") | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1123 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1124 use_zlib = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1125 } |
| 5284 | 1126 #endif |
|
15571
7b9551c65b7b
Don't report '-struct' as an unrecognized option to save().
Rik <rik@octave.org>
parents:
15567
diff
changeset
|
1127 else if (argv[i] == "-struct") |
|
7b9551c65b7b
Don't report '-struct' as an unrecognized option to save().
Rik <rik@octave.org>
parents:
15567
diff
changeset
|
1128 { |
|
7b9551c65b7b
Don't report '-struct' as an unrecognized option to save().
Rik <rik@octave.org>
parents:
15567
diff
changeset
|
1129 retval.append (argv[i]); |
|
7b9551c65b7b
Don't report '-struct' as an unrecognized option to save().
Rik <rik@octave.org>
parents:
15567
diff
changeset
|
1130 } |
|
15567
e05eafe7105a
Print an error message if save() called with unrecognized option (bug #37502)
Rik <rik@octave.org>
parents:
15467
diff
changeset
|
1131 else if (argv[i][0] == '-') |
|
e05eafe7105a
Print an error message if save() called with unrecognized option (bug #37502)
Rik <rik@octave.org>
parents:
15467
diff
changeset
|
1132 { |
|
e05eafe7105a
Print an error message if save() called with unrecognized option (bug #37502)
Rik <rik@octave.org>
parents:
15467
diff
changeset
|
1133 error ("save: Unrecognized option '%s'", argv[i].c_str ()); |
|
e05eafe7105a
Print an error message if save() called with unrecognized option (bug #37502)
Rik <rik@octave.org>
parents:
15467
diff
changeset
|
1134 } |
| 5284 | 1135 else |
|
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1136 retval.append (argv[i]); |
| 5284 | 1137 } |
| 1138 | |
|
8418
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1139 if (do_double) |
|
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1140 { |
|
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1141 if (format == LS_MAT_ASCII) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1142 format.opts |= LS_MAT_ASCII_LONG; |
|
8418
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1143 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1144 warning ("save: \"-double\" option only has an effect with \"-ascii\""); |
|
8418
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1145 } |
|
679c22082ac7
handle -double option for save
John W. Eaton <jwe@octave.org>
parents:
8377
diff
changeset
|
1146 |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1147 if (do_tabs) |
|
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1148 { |
|
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1149 if (format == LS_MAT_ASCII) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1150 format.opts |= LS_MAT_ASCII_TABS; |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1151 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1152 warning ("save: \"-tabs\" option only has an effect with \"-ascii\""); |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1153 } |
|
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1154 |
|
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1155 return retval; |
| 5284 | 1156 } |
| 1157 | |
|
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
1158 static string_vector |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1159 parse_save_options (const std::string &arg, load_save_format &format, |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1160 bool &append, bool &save_as_floats, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1161 bool &use_zlib) |
| 5284 | 1162 { |
| 5765 | 1163 std::istringstream is (arg); |
| 5284 | 1164 std::string str; |
| 1165 string_vector argv; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1166 |
| 5765 | 1167 while (! is.eof ()) |
| 5284 | 1168 { |
| 1169 is >> str; | |
| 1170 argv.append (str); | |
| 1171 } | |
| 1172 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1173 return parse_save_options (argv, format, append, save_as_floats, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1174 use_zlib); |
| 604 | 1175 } |
| 1176 | |
| 4329 | 1177 void |
| 3523 | 1178 write_header (std::ostream& os, load_save_format format) |
| 863 | 1179 { |
|
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
8418
diff
changeset
|
1180 switch (format.type) |
| 863 | 1181 { |
| 3185 | 1182 case LS_BINARY: |
| 1183 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1184 os << (oct_mach_info::words_big_endian () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1185 ? "Octave-1-B" : "Octave-1-L"); |
| 3185 | 1186 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1187 oct_mach_info::float_format flt_fmt = |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1188 oct_mach_info::native_float_format (); |
| 3185 | 1189 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1190 char tmp = static_cast<char> (float_format_to_mopt_digit (flt_fmt)); |
| 3185 | 1191 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1192 os.write (&tmp, 1); |
| 3185 | 1193 } |
| 3688 | 1194 break; |
| 1195 | |
| 1196 case LS_MAT5_BINARY: | |
| 5269 | 1197 case LS_MAT7_BINARY: |
| 3688 | 1198 { |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1199 char const * versionmagic; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1200 int16_t number = *(reinterpret_cast<const int16_t *>("\x00\x01")); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1201 struct tm bdt; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1202 time_t now; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1203 char headertext[128]; |
| 3688 | 1204 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1205 time (&now); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1206 bdt = *gmtime (&now); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1207 memset (headertext, ' ', 124); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1208 // ISO 8601 format date |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1209 nstrftime (headertext, 124, "MATLAB 5.0 MAT-file, written by Octave " |
|
9947
31436dcf7d0f
call nstrftime, not my_strftime
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
1210 OCTAVE_VERSION ", %Y-%m-%d %T UTC", &bdt, 1, 0); |
| 3688 | 1211 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1212 // The first pair of bytes give the version of the MAT file |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1213 // format. The second pair of bytes form a magic number which |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1214 // signals a MAT file. MAT file data are always written in |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1215 // native byte order. The order of the bytes in the second |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1216 // pair indicates whether the file was written by a big- or |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1217 // little-endian machine. However, the version number is |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1218 // written in the *opposite* byte order from everything else! |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1219 if (number == 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1220 versionmagic = "\x01\x00\x4d\x49"; // this machine is big endian |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1221 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1222 versionmagic = "\x00\x01\x49\x4d"; // this machine is little endian |
| 3688 | 1223 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1224 memcpy (headertext+124, versionmagic, 4); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1225 os.write (headertext, 128); |
| 3688 | 1226 } |
| 1227 | |
| 1228 break; | |
| 3185 | 1229 |
| 3687 | 1230 #ifdef HAVE_HDF5 |
| 1231 case LS_HDF5: | |
| 1232 #endif /* HAVE_HDF5 */ | |
| 3185 | 1233 case LS_ASCII: |
| 1234 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1235 octave_localtime now; |
| 3709 | 1236 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1237 std::string comment_string = now.strftime (Vsave_header_format_string); |
| 3709 | 1238 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1239 if (! comment_string.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1240 { |
| 3687 | 1241 #ifdef HAVE_HDF5 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1242 if (format == LS_HDF5) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1243 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1244 hdf5_ofstream& hs = dynamic_cast<hdf5_ofstream&> (os); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1245 H5Gset_comment (hs.file_id, "/", comment_string.c_str ()); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1246 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1247 else |
| 3687 | 1248 #endif /* HAVE_HDF5 */ |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1249 os << comment_string << "\n"; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1250 } |
| 3185 | 1251 } |
| 1252 break; | |
| 1253 | |
| 1254 default: | |
| 1255 break; | |
| 863 | 1256 } |
| 1257 } | |
| 1258 | |
| 1259 static void | |
| 3769 | 1260 save_vars (const string_vector& argv, int argv_idx, int argc, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1261 std::ostream& os, load_save_format fmt, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1262 bool save_as_floats, bool write_header_info) |
| 863 | 1263 { |
| 3185 | 1264 if (write_header_info) |
| 1265 write_header (os, fmt); | |
| 863 | 1266 |
| 1755 | 1267 if (argv_idx == argc) |
| 863 | 1268 { |
| 5794 | 1269 save_vars (os, "*", fmt, save_as_floats); |
| 863 | 1270 } |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1271 else if (argv[argv_idx] == "-struct") |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1272 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1273 if (++argv_idx >= argc) |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1274 { |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1275 error ("save: missing struct name"); |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1276 return; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1277 } |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1278 |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1279 std::string struct_name = argv[argv_idx]; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1280 |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1281 if (! symbol_table::is_variable (struct_name)) |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1282 { |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
1283 error ("save: no such variable: '%s'", struct_name.c_str ()); |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1284 return; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1285 } |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1286 |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
15571
diff
changeset
|
1287 octave_value struct_var = symbol_table::varval (struct_name); |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1288 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1289 if (! struct_var.is_map () || struct_var.numel () != 1) |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1290 { |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14268
diff
changeset
|
1291 error ("save: '%s' is not a scalar structure", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1292 struct_name.c_str ()); |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1293 return; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1294 } |
|
11059
4ffa19147604
replace Octave_map->octave_scalar_map in help.cc and load-save.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10846
diff
changeset
|
1295 octave_scalar_map struct_var_map = struct_var.scalar_map_value (); |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1296 |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1297 ++argv_idx; |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1298 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1299 if (argv_idx < argc) |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1300 { |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1301 for (int i = argv_idx; i < argc; i++) |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1302 { |
|
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
1303 if (! save_fields (os, struct_var_map, argv[i], fmt, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10309
diff
changeset
|
1304 save_as_floats)) |
|
7635
ba7a3e20ee3d
add -struct modifier to save
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|