Mercurial > octave
diff libinterp/corefcn/load-save.cc @ 20939:b17fda023ca6
maint: Use new C++ archetype in more files.
Place input validation first in files.
Move declaration of retval down in function to be closer to point of usage.
Eliminate else clause after if () error.
Use "return ovl()" where it makes sense.
* find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc,
graphics.cc, help.cc, hess.cc, hex2num.cc, input.cc, kron.cc, load-path.cc,
load-save.cc, lookup.cc, mappers.cc, matrix_type.cc, mgorth.cc, nproc.cc,
ordschur.cc, pager.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quad.cc,
rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse.cc, str2double.cc,
strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc,
syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc,
urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __eigs__.cc,
__glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc,
audiodevinfo.cc, audioread.cc, chol.cc, colamd.cc, dmperm.cc, fftw.cc, qr.cc,
symbfact.cc, symrcm.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc,
ov-java.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-re-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc, octave.cc:
Use new C++ archetype in more files.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 18 Dec 2015 15:37:22 -0800 |
parents | 1142cf6abc0d |
children | 48b2ad5ee801 |
line wrap: on
line diff
--- a/libinterp/corefcn/load-save.cc Fri Dec 18 16:22:53 2015 -0500 +++ b/libinterp/corefcn/load-save.cc Fri Dec 18 15:37:22 2015 -0800 @@ -1582,19 +1582,11 @@ @seealso{load, save_default_options, save_header_format_string, dlmread, csvread, fread}\n\ @end deftypefn") { - octave_value_list retval; - - string_vector argv = args.make_argv (); - // Here is where we would get the default save format if it were // stored in a user preference variable. - + load_save_format format = LS_TEXT; bool save_as_floats = false; - - load_save_format format = LS_TEXT; - bool append = false; - bool use_zlib = false; // get default options @@ -1602,8 +1594,11 @@ use_zlib); // override from command line + string_vector argv = args.make_argv (); + argv = parse_save_options (argv, format, append, save_as_floats, use_zlib); + int argc = argv.numel (); int i = 0; @@ -1613,6 +1608,8 @@ if (save_as_floats && format == LS_TEXT) error ("save: cannot specify both -text and -float-binary"); + octave_value_list retval; + if (argv[i] == "-") { i++;