octave: libinterp/corefcn/dlmread.cc annotate

annotate libinterp/corefcn/dlmread.cc @ 21200:fcac5dbbf9ed

maint: Indent #ifdef blocks in libinterp. * builtins.h, Cell.cc, __contourc__.cc, __dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc, __lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, cellfun.cc, colloc.cc, comment-list.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, defaults.in.h, defun-dld.h, defun.cc, defun.h, det.cc, dirfns.cc, display.cc, dlmread.cc, dot.cc, dynamic-ld.cc, eig.cc, ellipj.cc, error.cc, errwarn.cc, event-queue.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, gripes.cc, hash.cc, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-ir.cc, jit-typeinfo.cc, jit-util.cc, jit-util.h, kron.cc, load-path.cc, load-save.cc, lookup.cc, ls-ascii-helper.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, ls-oct-text.h, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, luinc.cc, mappers.cc, matrix_type.cc, max.cc, mex.h, mexproto.h, mgorth.cc, nproc.cc, oct-errno.in.cc, oct-fstrm.cc, oct-hdf5-types.cc, oct-hdf5.h, oct-hist.cc, oct-iostrm.cc, oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc, oct-stream.cc, oct-strstrm.cc, octave-link.cc, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, procstream.cc, profiler.cc, psi.cc, pt-jit.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, sysdep.h, time.cc, toplev.cc, tril.cc, tsearch.cc, txt-eng-ft.cc, txt-eng.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, xdiv.cc, xnorm.cc, xpow.cc, zfstream.cc, __delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, oct-qhull.h, qr.cc, symbfact.cc, symrcm.cc, oct-conf.in.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-classdef.cc, ov-colon.cc, ov-complex.cc, ov-cs-list.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.cc, ov-lazy-idx.cc, ov-mex-fcn.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.cc, ovl.cc, octave.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, pt-arg-list.cc, pt-array-list.cc, pt-assign.cc, pt-binop.cc, pt-bp.cc, pt-cbinop.cc, pt-cell.cc, pt-check.cc, pt-classdef.cc, pt-cmd.cc, pt-colon.cc, pt-colon.h, pt-const.cc, pt-decl.cc, pt-eval.cc, pt-except.cc, pt-exp.cc, pt-fcn-handle.cc, pt-funcall.cc, pt-id.cc, pt-idx.cc, pt-jump.cc, pt-loop.cc, pt-mat.cc, pt-misc.cc, pt-pr-code.cc, pt-select.cc, pt-stmt.cc, pt-unop.cc, pt.cc, token.cc, Array-jit.cc, Array-os.cc, Array-sym.cc, Array-tc.cc, version.cc: Indent #ifdef blocks in libinterp.

author	Rik <rik@octave.org>
date	Fri, 05 Feb 2016 16:29:08 -0800
parents	df7891224709
children	40de9f8f23a6

rev	line source
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	1 /*
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19278 diff changeset	3 Copyright (C) 2008-2015 Jonathan Stickel
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	4 Copyright (C) 2010 Jaroslav Hajek
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	5
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	6 This file is part of Octave.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	7
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	9 under the terms of the GNU General Public License as published by the
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	11 option) any later version.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	12
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	16 for more details.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	17
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	18 You should have received a copy of the GNU General Public License
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	19 along with Octave; see the file COPYING. If not, see
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	20 <http://www.gnu.org/licenses/>.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	21
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	22 */
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	23
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	24 // Adapted from previous version of dlmread.occ as authored by Kai
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	25 // Habel, but core code has been completely re-written.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	26
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	27 #ifdef HAVE_CONFIG_H
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21127 diff changeset	28 # include <config.h>
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	29 #endif
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	30
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	31 #include <cctype>
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	32 #include <fstream>
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	33 #include <limits>
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	34
9512 56e850e3b06f dlmread: perform tilde expansion to filename argument John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	35 #include "file-ops.h"
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	36 #include "lo-ieee.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	37
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	38 #include "defun.h"
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	39 #include "oct-stream.h"
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	40 #include "error.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20918 diff changeset	41 #include "ovl.h"
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	42 #include "utils.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	43
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	44 static const octave_idx_type idx_max =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	45 std::numeric_limits<octave_idx_type>::max ();
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	46
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	47 static bool
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	48 read_cell_spec (std::istream& is, octave_idx_type& row, octave_idx_type& col)
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	49 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	50 bool stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	51
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	52 if (is.peek () == std::istream::traits_type::eof ())
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	53 stat = true;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	54 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	55 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	56 if (::isalpha (is.peek ()))
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	57 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	58 col = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	59 while (is && ::isalpha (is.peek ()))
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	60 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	61 char ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	62 col *= 26;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	63 if (ch >= 'a')
10718 b8d76f4be94a Fix spreadsheet style range option (bug #30183). Rik <octave@nomad.inbox5.com> parents: 10350 diff changeset	64 col += ch - 'a' + 1;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	65 else
10718 b8d76f4be94a Fix spreadsheet style range option (bug #30183). Rik <octave@nomad.inbox5.com> parents: 10350 diff changeset	66 col += ch - 'A' + 1;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	67 }
21062 d9c1884d1aaa maint: Eliminate space between variable and decrement '--' operator. Rik <rik@octave.org> parents: 20955 diff changeset	68 col--;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	69
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	70 if (is)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	71 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	72 is >> row;
21062 d9c1884d1aaa maint: Eliminate space between variable and decrement '--' operator. Rik <rik@octave.org> parents: 20955 diff changeset	73 row--;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	74 if (is)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	75 stat = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	76 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	77 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	78 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	79
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	80 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	81 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	82
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	83 static bool
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	84 parse_range_spec (const octave_value& range_spec,
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	85 octave_idx_type& rlo, octave_idx_type& clo,
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	86 octave_idx_type& rup, octave_idx_type& cup)
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	87 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	88 bool stat = true;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	89
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	90 if (range_spec.is_string ())
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	91 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	92 std::istringstream is (range_spec.string_value ());
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	93 char ch = is.peek ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	94
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	95 if (ch == '.' \|\| ch == ':')
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	96 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	97 rlo = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	98 clo = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	99 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	100 if (ch == '.')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	101 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	102 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	103 if (ch != '.')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	104 stat = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	105 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	106 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	107 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	108 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	109 stat = read_cell_spec (is, rlo, clo);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	110
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	111 if (stat)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	112 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	113 ch = is.peek ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	114
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	115 if (ch == '.' \|\| ch == ':')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	116 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	117 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	118 if (ch == '.')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	119 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	120 ch = is.get ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	121 if (! is \|\| ch != '.')
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	122 stat = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	123 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	124
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	125 rup = idx_max - 1;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	126 cup = idx_max - 1;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	127 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	128 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	129 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	130 rup = rlo;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	131 cup = clo;
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	132 if (! is \|\| ! is.eof ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	133 stat = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	134 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	135 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	136 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	137
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	138 if (stat && is && ! is.eof ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	139 stat = read_cell_spec (is, rup, cup);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	140
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	141 if (! is \|\| ! is.eof ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	142 stat = false;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	143 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	144 else if (range_spec.is_real_matrix () && range_spec.numel () == 4)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	145 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	146 ColumnVector range(range_spec.vector_value ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	147 // double --> unsigned int
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	148 rlo = static_cast<octave_idx_type> (range(0));
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	149 clo = static_cast<octave_idx_type> (range(1));
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	150 rup = static_cast<octave_idx_type> (range(2));
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	151 cup = static_cast<octave_idx_type> (range(3));
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	152 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	153 else
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	154 stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	155
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	156 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	157 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	158
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	159 DEFUN (dlmread, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	160 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	161 @deftypefn {} {@var{data} =} dlmread (@var{file})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	162 @deftypefnx {} {@var{data} =} dlmread (@var{file}, @var{sep})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	163 @deftypefnx {} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{r0}, @var{c0})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	164 @deftypefnx {} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{range})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	165 @deftypefnx {} {@var{data} =} dlmread (@dots{}, \"emptyvalue\", @var{EMPTYVAL})\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19743 diff changeset	166 Read the matrix @var{data} from a text file which uses the delimiter\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19743 diff changeset	167 @var{sep} between data values.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19743 diff changeset	168 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19743 diff changeset	169 If @var{sep} is not defined the separator between fields is determined from\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19743 diff changeset	170 the file itself.\n\
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	171 \n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	172 Given two scalar arguments @var{r0} and @var{c0}, these define the starting\n\
9039 51dc9691f23f Cleanup documentation files errors.texi, debug.texi, io.texi Rik <rdrider0-list@yahoo.com> parents: 8290 diff changeset	173 row and column of the data to be read. These values are indexed from zero,\n\
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	174 such that the first row corresponds to an index of zero.\n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	175 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	176 The @var{range} parameter may be a 4-element vector containing the upper\n\
10718 b8d76f4be94a Fix spreadsheet style range option (bug #30183). Rik <octave@nomad.inbox5.com> parents: 10350 diff changeset	177 left and lower right corner @code{[@var{R0},@var{C0},@var{R1},@var{C1}]}\n\
b8d76f4be94a Fix spreadsheet style range option (bug #30183). Rik <octave@nomad.inbox5.com> parents: 10350 diff changeset	178 where the lowest index value is zero. Alternatively, a spreadsheet style\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	179 range such as @qcode{\"A2..Q15\"} or @qcode{\"T1:AA5\"} can be used. The\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	180 lowest alphabetical index @qcode{'A'} refers to the first column. The\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	181 lowest row index is 1.\n\
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	182 \n\
20713 2469d78a1d8b Consistently use 'filename' rather than 'file name' throughout code base. Rik <rik@octave.org> parents: 20555 diff changeset	183 @var{file} should be a filename or file id given by @code{fopen}. In the\n\
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	184 latter case, the file is read until end of file is reached.\n\
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	185 \n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	186 The @qcode{\"emptyvalue\"} option may be used to specify the value used to\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	187 fill empty fields. The default is zero.\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11553 diff changeset	188 @seealso{csvread, textscan, textread, dlmwrite}\n\
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	189 @end deftypefn")
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	190 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	191 int nargin = args.length ();
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	192
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	193 double empty_value = 0.0;
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	194
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	195 if (nargin > 2 && args(nargin-2).is_string ()
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	196 && args(nargin-2).string_value () == "emptyvalue")
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	197 {
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	198 empty_value = args(nargin-1).double_value ();
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	199
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	200 nargin -= 2;
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	201 }
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	202
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	203 if (nargin < 1 \|\| nargin > 4)
20802 8bb38ba1bad6 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	204 print_usage ();
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	205
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	206 std::istream *input = 0;
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	207 std::ifstream input_file;
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	208
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	209 if (args(0).is_string ())
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	210 {
20713 2469d78a1d8b Consistently use 'filename' rather than 'file name' throughout code base. Rik <rik@octave.org> parents: 20555 diff changeset	211 // Filename.
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	212 std::string fname (args(0).string_value ());
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	213
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	214 std::string tname = file_ops::tilde_expand (fname);
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	215
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	216 input_file.open (tname.c_str (), std::ios::in);
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	217
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	218 if (! input_file)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20802 diff changeset	219 error ("dlmread: unable to open file '%s'", fname.c_str ());
35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20802 diff changeset	220
35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20802 diff changeset	221 input = &input_file;
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	222 }
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	223 else if (args(0).is_scalar_type ())
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	224 {
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	225 octave_stream is = octave_stream_list::lookup (args(0), "dlmread");
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	226
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	227 input = is.input_stream ();
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	228
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	229 if (! input)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20802 diff changeset	230 error ("dlmread: stream FILE not open for input");
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	231 }
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	232 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20802 diff changeset	233 error ("dlmread: FILE argument must be a string or file id");
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	234
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	235 // Set default separator.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	236 std::string sep;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	237 if (nargin > 1)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	238 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	239 if (args(1).is_sq_string ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	240 sep = do_string_escapes (args(1).string_value ());
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	241 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	242 sep = args(1).string_value ();
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	243 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	244
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	245 // Take a subset if a range was given.
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	246 octave_idx_type r0 = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	247 octave_idx_type c0 = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	248 octave_idx_type r1 = idx_max-1;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	249 octave_idx_type c1 = idx_max-1;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	250 if (nargin > 2)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	251 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	252 if (nargin == 3)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	253 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	254 if (! parse_range_spec (args(2), r0, c0, r1, c1))
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	255 error ("dlmread: error parsing RANGE");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	256 }
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	257 else if (nargin == 4)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	258 {
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	259 r0 = args(2).idx_type_value ();
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	260 c0 = args(3).idx_type_value ();
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	261 }
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	262
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	263 if (r0 < 0 \|\| c0 < 0)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	264 error ("dlmread: left & top must be positive");
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	265 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	266
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	267 octave_idx_type i = 0;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	268 octave_idx_type j = 0;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	269 octave_idx_type r = 1;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	270 octave_idx_type c = 1;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	271 octave_idx_type rmax = 0;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	272 octave_idx_type cmax = 0;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	273
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	274 Matrix rdata;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	275 ComplexMatrix cdata;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	276
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	277 bool iscmplx = false;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	278 bool sepflag = false;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	279
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	280 std::string line;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	281
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	282 // Skip the r0 leading lines as these might be a header.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	283 for (octave_idx_type m = 0; m < r0; m++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	284 getline (*input, line);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	285 r1 -= r0;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	286
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	287 std::istringstream tmp_stream;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	288
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	289 // Read in the data one field at a time, growing the data matrix
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	290 // as needed.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	291 while (getline (*input, line))
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	292 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	293 // Skip blank lines for compatibility.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	294 if (line.find_first_not_of (" \t") == std::string::npos)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	295 continue;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	296
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	297 // To be compatible with matlab, blank separator should
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	298 // correspond to whitespace as delimter.
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	299 if (! sep.length ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	300 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	301 size_t n = line.find_first_of (",:; \t",
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	302 line.find_first_of ("0123456789"));
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	303 if (n == std::string::npos)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	304 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	305 sep = " \t";
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	306 sepflag = true;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	307 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	308 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	309 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	310 char ch = line.at (n);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	311
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	312 switch (line.at (n))
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	313 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	314 case ' ':
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	315 case '\t':
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	316 sepflag = true;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	317 sep = " \t";
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	318 break;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	319
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	320 default:
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	321 sep = ch;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	322 break;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	323 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	324 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	325 }
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	326
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	327 if (cmax == 0)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	328 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	329 // Try to estimate the number of columns. Skip leading
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	330 // whitespace.
12182 99b00a9a5147 dlmread: skip leading whitespace on each line John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	331 size_t pos1 = line.find_first_not_of (" \t");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	332 do
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	333 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	334 size_t pos2 = line.find_first_of (sep, pos1);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	335
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	336 if (sepflag && pos2 != std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	337 // Treat consecutive separators as one.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	338 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	339 pos2 = line.find_first_not_of (sep, pos2);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	340 if (pos2 != std::string::npos)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	341 pos2 -= 1;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	342 else
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	343 pos2 = line.length () - 1;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	344 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	345
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	346 cmax++;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	347
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	348 if (pos2 != std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	349 pos1 = pos2 + 1;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	350 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	351 pos1 = std::string::npos;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	352
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	353 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	354 while (pos1 != std::string::npos);
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	355
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	356 if (iscmplx)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	357 cdata.resize (rmax, cmax);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	358 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	359 rdata.resize (rmax, cmax);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	360 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	361
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	362 r = (r > i + 1 ? r : i + 1);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	363 j = 0;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	364 // Skip leading whitespace.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	365 size_t pos1 = line.find_first_not_of (" \t");
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	366 do
20213 ca2da088eada Return an empty matrix, not error, from dlmread when file is empty (bug #45156). Rik <rik@octave.org> parents: 20172 diff changeset	367 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	368 octave_quit ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	369
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	370 size_t pos2 = line.find_first_of (sep, pos1);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	371 std::string str = line.substr (pos1, pos2 - pos1);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	372
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	373 if (sepflag && pos2 != std::string::npos)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	374 // Treat consecutive separators as one.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	375 pos2 = line.find_first_not_of (sep, pos2) - 1;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	376
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	377 c = (c > j + 1 ? c : j + 1);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	378 if (r > rmax \|\| c > cmax)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	379 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	380 // Use resize_and_fill for the case of not-equal
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	381 // length rows.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	382 rmax = 2*r;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	383 cmax = c;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	384 if (iscmplx)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	385 cdata.resize (rmax, cmax);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	386 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	387 rdata.resize (rmax, cmax);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	388 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	389
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	390 tmp_stream.str (str);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	391 tmp_stream.clear ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	392
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	393 double x = octave_read_double (tmp_stream);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	394 if (tmp_stream)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	395 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	396 if (tmp_stream.eof ())
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	397 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	398 if (iscmplx)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	399 cdata(i,j++) = x;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	400 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	401 rdata(i,j++) = x;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	402 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	403 else if (std::toupper (tmp_stream.peek ()) == 'I')
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	404 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	405 // This is to allow pure imaginary numbers.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	406 if (iscmplx)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	407 cdata(i,j++) = x;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	408 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	409 rdata(i,j++) = x;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	410 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	411 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	412 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	413 double y = octave_read_double (tmp_stream);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	414
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	415 if (! iscmplx && y != 0.)
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	416 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	417 iscmplx = true;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	418 cdata = ComplexMatrix (rdata);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	419 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	420
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	421 if (iscmplx)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	422 cdata(i,j++) = Complex (x, y);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	423 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	424 rdata(i,j++) = x;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	425 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	426 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	427 else if (iscmplx)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	428 cdata(i,j++) = empty_value;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	429 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	430 rdata(i,j++) = empty_value;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	431
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	432 if (pos2 != std::string::npos)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	433 pos1 = pos2 + 1;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	434 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	435 pos1 = std::string::npos;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	436
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	437 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	438 while (pos1 != std::string::npos);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	439
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	440 if (i == r1)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	441 break;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	442
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	443 i++;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	444 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	445
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	446 if (r1 >= r)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	447 r1 = r - 1;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	448 if (c1 >= c)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	449 c1 = c - 1;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	450
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	451 // Now take the subset of the matrix if there are any values.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	452 if (i > 0 \|\| j > 0)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	453 {
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	454 if (iscmplx)
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	455 cdata = cdata.extract (0, c0, r1, c1);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	456 else
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	457 rdata = rdata.extract (0, c0, r1, c1);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	458 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	459
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	460 if (iscmplx)
21127 df7891224709 maint: Use "return ovl (...)" in DEFUN macros. Rik <rik@octave.org> parents: 21062 diff changeset	461 return ovl (cdata);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20213 diff changeset	462 else
21127 df7891224709 maint: Use "return ovl (...)" in DEFUN macros. Rik <rik@octave.org> parents: 21062 diff changeset	463 return ovl (rdata);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	464 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	465
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	466 /*
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	467 %!shared file
19278 6ca096827123 Use tempname() rather than tmpnam() in core Octave. Rik <rik@octave.org> parents: 18112 diff changeset	468 %! file = tempname ();
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	469 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	470 %! fwrite (fid, "1, 2, 3\n4, 5, 6\n7, 8, 9\n10, 11, 12");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	471 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	472
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	473 %!assert (dlmread (file), [1, 2, 3; 4, 5, 6; 7, 8, 9;10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	474 %!assert (dlmread (file, ","), [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	475 %!assert (dlmread (file, ",", [1, 0, 2, 1]), [4, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	476 %!assert (dlmread (file, ",", "B1..C2"), [2, 3; 5, 6])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	477 %!assert (dlmread (file, ",", "B1:C2"), [2, 3; 5, 6])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	478 %!assert (dlmread (file, ",", "..C2"), [1, 2, 3; 4, 5, 6])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	479 %!assert (dlmread (file, ",", 0, 1), [2, 3; 5, 6; 8, 9; 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	480 %!assert (dlmread (file, ",", "B1.."), [2, 3; 5, 6; 8, 9; 11, 12])
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	481 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	482
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	483 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	484 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	485
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	486 %!shared file
19278 6ca096827123 Use tempname() rather than tmpnam() in core Octave. Rik <rik@octave.org> parents: 18112 diff changeset	487 %! file = tempname ();
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	488 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	489 %! fwrite (fid, "1, 2, 3\n4+4i, 5, 6\n7, 8, 9\n10, 11, 12");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	490 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	491
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	492 %!assert (dlmread (file), [1, 2, 3; 4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	493 %!assert (dlmread (file, ","), [1, 2, 3; 4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	494 %!assert (dlmread (file, ",", [1, 0, 2, 1]), [4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	495 %!assert (dlmread (file, ",", "A2..B3"), [4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	496 %!assert (dlmread (file, ",", "A2:B3"), [4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	497 %!assert (dlmread (file, ",", "..B3"), [1, 2; 4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	498 %!assert (dlmread (file, ",", 1, 0), [4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	499 %!assert (dlmread (file, ",", "A2.."), [4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	500 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	501
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	502 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	503 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	504 */

Mercurial > octave

annotate libinterp/corefcn/dlmread.cc @ 21200:fcac5dbbf9ed