octave-nkf: scripts/io/textscan.m annotate

annotate scripts/io/textscan.m @ 16311:9c4ac8f25a8c

textscan.m, textread.m: fix wrong code assessing EOL char(s), remove duplicate code

author	Philip Nienhuis <prnienhuis@users.sf.net>
date	Fri, 15 Mar 2013 09:54:53 +0100
parents	23636765e00a
children	0cbe330f39a2

rev	line source
16060 f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	1 ## Copyright (C) 2010-2013 Ben Abbott <bpabbott@mac.com>
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	2 ##
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	3 ## This file is part of Octave.
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	4 ##
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	5 ## Octave is free software; you can redistribute it and/or modify it
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	6 ## under the terms of the GNU General Public License as published by
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	7 ## the Free Software Foundation; either version 3 of the License, or (at
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	8 ## your option) any later version.
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	9 ##
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	10 ## Octave is distributed in the hope that it will be useful, but
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	13 ## General Public License for more details.
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	14 ##
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	15 ## You should have received a copy of the GNU General Public License
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	16 ## along with Octave; see the file COPYING. If not, see
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	17 ## <http://www.gnu.org/licenses/>.
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	18
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	19 ## -- texinfo --
11471 994e2a93a8e2 Use uppercase 'A' to refer to matrix inputs in m-files. Rik <octave@nomad.inbox5.com> parents: 11469 diff changeset	20 ## @deftypefn {Function File} {@var{C} =} textscan (@var{fid}, @var{format})
12575 d0b799dafede Grammarcheck files for 3.4.1 release. Rik <octave@nomad.inbox5.com> parents: 11589 diff changeset	21 ## @deftypefnx {Function File} {@var{C} =} textscan (@var{fid}, @var{format}, @var{n})
d0b799dafede Grammarcheck files for 3.4.1 release. Rik <octave@nomad.inbox5.com> parents: 11589 diff changeset	22 ## @deftypefnx {Function File} {@var{C} =} textscan (@var{fid}, @var{format}, @var{param}, @var{value}, @dots{})
d0b799dafede Grammarcheck files for 3.4.1 release. Rik <octave@nomad.inbox5.com> parents: 11589 diff changeset	23 ## @deftypefnx {Function File} {@var{C} =} textscan (@var{fid}, @var{format}, @var{n}, @var{param}, @var{value}, @dots{})
11471 994e2a93a8e2 Use uppercase 'A' to refer to matrix inputs in m-files. Rik <octave@nomad.inbox5.com> parents: 11469 diff changeset	24 ## @deftypefnx {Function File} {@var{C} =} textscan (@var{str}, @dots{})
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	25 ## @deftypefnx {Function File} {[@var{C}, @var{position}] =} textscan (@var{fid}, @dots{})
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	26 ## Read data from a text file or string.
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	27 ##
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	28 ## The string @var{str} or file associated with @var{fid} is read from and
14853 72b8b39e12be doc: Periodic grammarcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 14800 diff changeset	29 ## parsed according to @var{format}. The function behaves like @code{strread}
72b8b39e12be doc: Periodic grammarcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 14800 diff changeset	30 ## except it can also read from file instead of a string. See the documentation
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	31 ## of @code{strread} for details.
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	32 ##
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	33 ## In addition to the options supported by @code{strread}, this function
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	34 ## supports a few more:
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	35 ##
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	36 ## @itemize
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	37 ## @item "collectoutput":
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	38 ## A value of 1 or true instructs textscan to concatenate consecutive columns
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	39 ## of the same class in the output cell array. A value of 0 or false (default)
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	40 ## leaves output in distinct columns.
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	41 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	42 ## @item "endofline":
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	43 ## Specify "\r", "\n" or "\r\n" (for CR, LF, or CRLF). If no value is given,
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	44 ## it will be inferred from the file. If set to "" (empty string) EOLs are
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	45 ## ignored as delimiters and added to whitespace.
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	46 ##
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	47 ## @item "headerlines":
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	48 ## The first @var{value} number of lines of @var{fid} are skipped.
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	49 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	50 ## @item "returnonerror":
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	51 ## If set to numerical 1 or true (default), return normally when read errors
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	52 ## have been encountered. If set to 0 or false, return an error and no data.
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	53 ## As the string or file is read by columns rather than by rows, and because
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	54 ## textscan is fairly forgiving as regards read errors, setting this option
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	55 ## may have little or no actual effect.
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	56 ## @end itemize
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	57 ##
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	58 ## When reading from a character string, optional input argument @var{n}
14621 1804d5422f61 doc: Periodic spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 14582 diff changeset	59 ## specifies the number of times @var{format} should be used (i.e., to limit
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	60 ## the amount of data read).
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	61 ## When reading from file, @var{n} specifies the number of data lines to read;
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	62 ## in this sense it differs slightly from the format repeat count in strread.
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	63 ##
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	64 ## The output @var{C} is a cell array whose second dimension is determined
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	65 ## by the number of format specifiers.
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	66 ##
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	67 ## The second output, @var{position}, provides the position, in characters,
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	68 ## from the beginning of the file.
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	69 ##
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	70 ## @seealso{dlmread, fscanf, load, strread, textread}
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	71 ## @end deftypefn
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	72
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	73 function [C, position] = textscan (fid, format = "%f", varargin)
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	74
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	75 BUFLENGTH = 4096; ## Read buffer
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	76
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	77 ## Check input
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	78 if (nargin < 1)
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	79 print_usage ();
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	80 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	81
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	82 if (isempty (format))
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	83 format = "%f";
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	84 endif
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	85
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	86 if (! ischar (format))
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	87 error ("textscan: FORMAT must be a string");
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	88 endif
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	89
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	90 ## Determine the number of data fields & initialize output array
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	91 num_fields = numel (strfind (format, "%")) - numel (strfind (format, "%*"));
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	92 C = cell (1, num_fields);
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	93
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	94 if (! (isa (fid, "double") && fid > 0) && ! ischar (fid))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	95 error ("textscan: first argument must be a file id or character string");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	96 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	97
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	98 args = varargin;
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	99 if (nargin > 2 && isnumeric (args{1}))
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	100 nlines = args{1};
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	101 else
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	102 nlines = Inf;
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	103 endif
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	104 if (nlines < 1)
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	105 printf ("textscan: N = 0, no data read\n");
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	106 return
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	107 endif
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	108
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	109 if (! any (strcmpi (args, "emptyvalue")))
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	110 ## Matlab returns NaNs for missing values
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	111 args(end+1:end+2) = {'emptyvalue', NaN};
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	112 endif
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	113
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	114 ## Check default parameter values that differ for strread & textread
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	115
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	116 ipos = find (strcmpi (args, "whitespace"));
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	117 if (isempty (ipos))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	118 ## Matlab default whitespace = " \b\t"
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	119 args(end+1:end+2) = {'whitespace', " \b\t"};
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	120 whitespace = " \b\t";
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	121 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	122 ## Check if there's at least one string format specifier
14213 a022c04f68cc Replace to-be-deprecated strmatch occurrences with alternate code. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	123 has_str_fmt = regexp (format, '%[]?\ds', "once");
a022c04f68cc Replace to-be-deprecated strmatch occurrences with alternate code. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	124 ## If there is a string format AND whitespace value = empty,
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	125 ## don't add a space (char(32)) to whitespace
14213 a022c04f68cc Replace to-be-deprecated strmatch occurrences with alternate code. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	126 if (! (isempty (args{ipos+1}) && has_str_fmt))
15871 878623ca15e1 textscan.m: fix treatment of whitespace argument (bug #37961) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	127 args{ipos+1} = unique ([" ", args{ipos+1}]);
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	128 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	129 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	130
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	131 if (! any (strcmpi (args, "delimiter")))
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 12916 diff changeset	132 ## Matlab says default delimiter = whitespace.
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	133 ## strread() will pick this up further
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	134 args(end+1:end+2) = {'delimiter', ""};
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	135 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	136
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	137 collop = false;
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	138 ipos = find (strcmpi (args, "collectoutput"));
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	139 if (! isempty (ipos))
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	140 ## Search & concatenate consecutive columns of same class requested
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	141 if (isscalar (args{ipos+1})
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	142 && (islogical (args{ipos+1}) \|\| isnumeric (args{ipos+1})))
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	143 collop = args{ipos+1};
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	144 else
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	145 warning ("textscan: illegal value for CollectOutput parameter - ignored");
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	146 endif
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	147 ## Remove argument before call to strread() below
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	148 args(ipos:ipos+1) = [];
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	149 endif
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	150
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	151 if (any (strcmpi (args, "returnonerror")))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	152 ## Because of the way strread() reads data (columnwise) this parameter
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	153 ## can't be neatly implemented. strread() will pick it up anyway
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	154 warning ('textscan: ReturnOnError is not fully implemented');
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	155 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	156 ## Set default value (=true)
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	157 args(end+1:end+2) = {"returnonerror", 1};
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	158 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	159
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	160 if (ischar (fid))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	161 ## Read from a text string
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	162 if (nargout == 2)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	163 error ("textscan: cannot provide position information for character input");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	164 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	165 str = fid;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	166 else
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	167 st_pos = ftell (fid);
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	168 ## Skip header lines if requested
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	169 headerlines = find (strcmpi (args, "headerlines"), 1);
16060 f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	170 if (! isempty (headerlines))
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	171 ## Beware of missing or wrong headerline value
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	172 if (headerlines == numel (args)
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	173 \|\| ! isnumeric (args{headerlines + 1}))
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	174 error ("Missing or illegal value for 'headerlines'" );
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	175 endif
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	176 ## Avoid conveying floats to fskipl
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	177 args{headerlines + 1} = round (args{headerlines + 1});
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	178 if (args{headerlines + 1} > 0)
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	179 ## Beware of zero valued headerline, fskipl would skip to EOF
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	180 fskipl (fid, args{headerlines + 1});
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	181 args(headerlines:headerlines+1) = [];
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	182 st_pos = ftell (fid);
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	183 elseif (args{headerlines + 1} < 0)
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	184 warning ("textscan.m: negative headerline value ignored");
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	185 endif
16305 23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	186 endif
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	187 ## Read a first file chunk. Rest follows after endofline processing
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	188 [str, count] = fscanf (fid, "%c", BUFLENGTH);
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	189
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	190 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	191
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	192 ## Check for empty result
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	193 if (isempty (str))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	194 warning ("textscan: no data read");
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	195 return;
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	196 endif
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	197
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	198 ## Check value of 'endofline'. String or file doesn't seem to matter
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	199 endofline = find (strcmpi (args, "endofline"), 1);
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	200 if (! isempty (endofline))
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 12916 diff changeset	201 if (ischar (args{endofline + 1}))
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	202 eol_char = args{endofline + 1};
14213 a022c04f68cc Replace to-be-deprecated strmatch occurrences with alternate code. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	203 if (! any (strcmp (eol_char, {"", "\n", "\r", "\r\n"})))
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	204 error ("textscan: illegal EndOfLine character value specified");
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	205 endif
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	206 else
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 12916 diff changeset	207 error ("textscan: character value required for EndOfLine");
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	208 endif
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	209 else
15868 6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	210 if (! ischar (fid))
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	211 ## Determine EOL from file. Search for EOL candidates in first BUFLENGTH chars
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	212 eol_srch_len = min (length (str), BUFLENGTH);
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	213 ## First try DOS (CRLF)
16311 9c4ac8f25a8c textscan.m, textread.m: fix wrong code assessing EOL char(s), remove duplicate code Philip Nienhuis <prnienhuis@users.sf.net> parents: 16305 diff changeset	214 if (! isempty (strfind (str(1 : eol_srch_len), "\r\n")))
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	215 eol_char = "\r\n";
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	216 ## Perhaps old Macintosh? (CR)
16311 9c4ac8f25a8c textscan.m, textread.m: fix wrong code assessing EOL char(s), remove duplicate code Philip Nienhuis <prnienhuis@users.sf.net> parents: 16305 diff changeset	217 elseif (! isempty (strfind (str(1 : eol_srch_len), "\r")))
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	218 eol_char = "\r";
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	219 ## Otherwise, use plain UNIX (LF)
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	220 else
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	221 eol_char = "\n";
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	222 endif
15868 6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	223 else
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	224 eol_char = "\n";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	225 endif
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	226 ## Set up the default endofline param value
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	227 args(end+1:end+2) = {"endofline", eol_char};
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	228 endif
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	229
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	230 if (!ischar (fid))
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	231 ## Now that we know what EOL looks like, we can process format_repeat_count.
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	232 ## FIXME The below isn't ML-compatible: counts lines, not format string uses
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	233 if (isfinite (nlines) && (nlines >= 0))
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	234 l_eol_char = length (eol_char);
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	235 eoi = findstr (str, eol_char);
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	236 n_eoi = length (eoi);
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	237 nblks = 0;
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	238 ## Avoid slow repeated str concatenation, first seek requested end of data
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	239 while (n_eoi < nlines && count == BUFLENGTH)
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	240 [nstr, count] = fscanf (fid, "%c", BUFLENGTH);
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	241 if (count > 0)
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	242 ## Watch out for multichar EOL being missed across buffer boundaries
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	243 if (l_eol_char > 1)
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	244 str = [str(end - length (eol_char) + 2 : end) nstr];
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	245 else
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	246 str = nstr;
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	247 endif
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	248 eoi = findstr (str, eol_char);
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	249 n_eoi += numel (eoi);
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	250 ++nblks;
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	251 endif
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	252 endwhile
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	253 ## OK, found EOL delimiting last requested line. Compute ptr (incl. EOL)
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	254 if (isempty (eoi))
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	255 printf ("textscan: format repeat count specified but no endofline found\n");
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	256 data_size = nblks * BUFLENGTH + count;
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	257 else
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	258 ## Compute data size to read incl complete EOL
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	259 data_size = (nblks * BUFLENGTH) + eoi(end + min (nlines, n_eoi) - n_eoi) \
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	260 + l_eol_char - 1;
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	261 endif
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	262 fseek (fid, st_pos, "bof");
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	263 str = fscanf (fid, "%c", data_size);
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	264 else
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	265 fseek (fid, st_pos, "bof");
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	266 str = fread (fid, "char=>char").';
98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	267 endif
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	268 endif
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	269
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	270 ## Strip trailing EOL to avoid returning stray missing values (f. strread).
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	271 ## However, in case of CollectOutput request, presence of EOL is required
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	272 eol_at_end = strcmp (str(end-length (eol_char) + 1 : end), eol_char);
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	273 if (collop)
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	274 if (! eol_at_end)
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	275 str(end+1 : end+length (eol_char)) = eol_char;
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	276 endif
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	277 elseif (eol_at_end)
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	278 str(end-length (eol_char) + 1 : end) = "";
14800 a922f768ee09 textscan, strread: improved ML compatibility (bug 36398) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14799 diff changeset	279 ## A corner case: str may now be empty....
a922f768ee09 textscan, strread: improved ML compatibility (bug 36398) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14799 diff changeset	280 if (isempty (str)); return; endif
a922f768ee09 textscan, strread: improved ML compatibility (bug 36398) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14799 diff changeset	281 endif
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	282
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	283 ## Call strread to make it do the real work
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	284 C = cell (1, num_fields);
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	285 [C{:}] = strread (str, format, args{:});
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 12916 diff changeset	286
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	287 ## If requested, collect output columns of same class
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	288 if (collop)
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	289 C = colloutp (C);
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	290 endif
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	291
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	292 if (nargout == 2)
14565 98aaebc56d7c 2012-03-25 Philip Nienhuis <prnienhuis@users.sf.net> Philip Nienhuis <prnienhuis@@users.sf.net> parents: 14552 diff changeset	293 ## Remember file position (persistent var)
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	294 position = ftell (fid);
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	295 endif
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	296
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	297 endfunction
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	298
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	299
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	300 ## Collect consecutive columns of same class into one cell column
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	301 function C = colloutp (C)
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	302
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	303 ## Start at rightmost column and work backwards to avoid ptr mixup
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	304 ii = numel (C);
14552 86854d032a37 maint: miscellaneous style fixes for .m files John W. Eaton <jwe@octave.org> parents: 14363 diff changeset	305 while (ii > 1)
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	306 clss1 = class (C{ii});
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	307 jj = ii;
14552 86854d032a37 maint: miscellaneous style fixes for .m files John W. Eaton <jwe@octave.org> parents: 14363 diff changeset	308 while (jj > 1 && strcmp (clss1, class (C{jj - 1})))
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	309 ## Column to the left is still same class; check next column to the left
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	310 --jj;
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	311 endwhile
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	312 if (jj < ii)
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	313 ## Concatenate columns into current column
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	314 C{jj} = [C{jj : ii}];
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	315 ## Wipe concatenated columns to the right, resume search to the left
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	316 C(jj+1 : ii) = [];
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	317 ii = jj - 1;
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	318 else
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	319 ## No similar class in column to the left, search from there
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	320 --ii;
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	321 endif
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	322 endwhile
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	323
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	324 endfunction
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	325
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14214 diff changeset	326
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	327 %!test
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	328 %! str = "1, 2, 3, 4\n 5, , , 8\n 9, 10, 11, 12";
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	329 %! fmtstr = "%f %d %f %s";
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	330 %! c = textscan (str, fmtstr, 2, "delimiter", ",", "emptyvalue", -Inf);
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	331 %! assert (isequal (c{1}, [1;5]));
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	332 %! assert (length (c{1}), 2);
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	333 %! assert (iscellstr (c{4}));
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	334 %! assert (isequal (c{3}, [3; -Inf]));
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	335
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	336 %!test
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	337 %! b = [10:10:100];
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	338 %! b = [b; 8*b/5];
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	339 %! str = sprintf ("%g miles/hr = %g kilometers/hr\n", b);
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	340 %! fmt = "%f miles/hr = %f kilometers/hr";
224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	341 %! c = textscan (str, fmt);
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	342 %! assert (b(1,:)', c{1}, 1e-5);
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	343 %! assert (b(2,:)', c{2}, 1e-5);
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	344
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	345 %!test
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	346 %! str = "13, 72, NA, str1, 25\r\n// Middle line\r\n36, na, 05, str3, 6";
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	347 %! a = textscan (str, "%d %n %f %s %n", "delimiter", ",","treatAsEmpty", {"NA", "na"},"commentStyle", "//");
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	348 %! assert (a{1}, int32 ([13; 36]));
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	349 %! assert (a{2}, [72; NaN]);
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	350 %! assert (a{3}, [NaN; 5]);
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	351 %! assert (a{4}, {"str1"; "str3"});
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	352 %! assert (a{5}, [25; 6]);
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	353
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	354 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	355 %! str = "Km:10 = hhhBjjj miles16hour\r\n";
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	356 %! str = [str "Km:15 = hhhJjjj miles241hour\r\n"];
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	357 %! str = [str "Km:2 = hhhRjjj miles3hour\r\n"];
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	358 %! str = [str "Km:25 = hhhZ\r\n"];
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	359 %! fmt = "Km:%d = hhh%1sjjj miles%dhour";
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14214 diff changeset	360 %! a = textscan (str, fmt, "delimiter", " ");
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	361 %! assert (a{1}', int32 ([10 15 2 25]));
12866 fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12679 diff changeset	362 %! assert (a{2}', {'B' 'J' 'R' 'Z'});
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	363 %! assert (a{3}', int32 ([16 241 3 0]));
11141 224c80da37c5 textscan.m: Add new function. Ben Abbott <bpabbott@mac.com> parents: diff changeset	364
12891 f5a3f77d51aa strread.m, textscan.m: More Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12880 diff changeset	365 %% Test with default endofline parameter
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12880 diff changeset	366 %!test
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12880 diff changeset	367 %! c = textscan ("L1\nL2", "%s");
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12880 diff changeset	368 %! assert (c{:}, {"L1"; "L2"});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12880 diff changeset	369
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14214 diff changeset	370 %% Test with endofline parameter set to "" (empty) - newline should be in word
12891 f5a3f77d51aa strread.m, textscan.m: More Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12880 diff changeset	371 %!test
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14214 diff changeset	372 %! c = textscan ("L1\nL2", "%s", "endofline", "");
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	373 %! assert (int8 (c{:}{:}), int8 ([ 76, 49, 10, 76, 50 ]));
12891 f5a3f77d51aa strread.m, textscan.m: More Matlab compatability Philip Nienhuis <prnienhuis@users.sf.net> parents: 12880 diff changeset	374
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	375 %!test
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	376 %! # No delimiters at all besides EOL. Skip fields, even empty fields
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	377 %! str = "Text1Text2Text\nTextText4Text\nText57Text";
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	378 %! c = textscan (str, "Text%*dText%dText");
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	379 %! assert (c{1}, int32 ([2; 4; 0]));
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	380
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	381 %!test
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	382 %% CollectOutput test
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	383 %! b = [10:10:100];
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	384 %! b = [b; 8b/5; 8b*1000/5];
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	385 %! str = sprintf ("%g miles/hr = %g (%g) kilometers (meters)/hr\n", b);
ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	386 %! fmt = "%f miles%s %s %f (%f) kilometers %*s";
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14214 diff changeset	387 %! c = textscan (str, fmt, "collectoutput", 1);
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	388 %! assert (size (c{3}), [10, 2]);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	389 %! assert (size (c{2}), [10, 2]);
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	390
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	391 %!test
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	392 %% CollectOutput test with uneven column length files
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	393 %! b = [10:10:100];
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	394 %! b = [b; 8b/5; 8b*1000/5];
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	395 %! str = sprintf ("%g miles/hr = %g (%g) kilometers (meters)/hr\n", b);
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	396 %! str = [str "110 miles/hr"];
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	397 %! fmt = "%f miles%s %s %f (%f) kilometers %*s";
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	398 %! c = textscan (str, fmt, "collectoutput", 1);
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	399 %! assert (size (c{1}), [11, 1]);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	400 %! assert (size (c{3}), [11, 2]);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	401 %! assert (size (c{2}), [11, 2]);
14799 21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	402 %! assert (c{3}(end), NaN);
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	403 %! assert (c{2}{11, 1}, "/hr");
21197c43f984 Better Matlab compatibility of textscan, bugs #36356 and #36392 Philip Nienhuis <prnienhuis@users.sf.net> parents: 14621 diff changeset	404 %! assert (isempty (c{2}{11, 2}), true);
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	405
12877 ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	406 %% Test input validation
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	407 %!error textscan ()
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	408 %!error textscan (single (4))
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	409 %!error textscan ({4})
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	410 %!error <must be a string> textscan ("Hello World", 2)
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	411 %!error <cannot provide position information> [C, pos] = textscan ("Hello World")
ddea3962b024 Various improvements to strread, textread, textscan functions Rik <octave@nomad.inbox5.com> parents: 12873 diff changeset	412 %!error <character value required> textscan ("Hello World", '%s', 'EndOfLine', 3)
12914 ac00ae83ea2e More compatibility improvements for textscan and strread Philip Nienhuis <prnienhuis@users.sf.net> parents: 12891 diff changeset	413
14800 a922f768ee09 textscan, strread: improved ML compatibility (bug 36398) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14799 diff changeset	414 %! Test incomplete first data line
a922f768ee09 textscan, strread: improved ML compatibility (bug 36398) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14799 diff changeset	415 %! R = textscan (['Empty1' char(10)], 'Empty%d %f');
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	416 %! assert (R{1}, int32 (1));
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14853 diff changeset	417 %! assert (isempty (R{2}), true);
15263 2136343014d5 bug #37023 (wrong reading of lines starting and/or ending with whitespace) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14868 diff changeset	418
2136343014d5 bug #37023 (wrong reading of lines starting and/or ending with whitespace) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14868 diff changeset	419 %% bug #37023 (actually a strread test)
2136343014d5 bug #37023 (wrong reading of lines starting and/or ending with whitespace) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14868 diff changeset	420 %!test
2136343014d5 bug #37023 (wrong reading of lines starting and/or ending with whitespace) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14868 diff changeset	421 %! data = textscan(" 1. 1 \n 2 3\n", '%f %f');
2136343014d5 bug #37023 (wrong reading of lines starting and/or ending with whitespace) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14868 diff changeset	422 %! assert (data{1}, [1; 2], 1e-15);
2136343014d5 bug #37023 (wrong reading of lines starting and/or ending with whitespace) Philip Nienhuis <prnienhuis@users.sf.net> parents: 14868 diff changeset	423 %! assert (data{2}, [1; 3], 1e-15);
15868 6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	424
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	425 %% Whitespace test (bug #37333) using delimiter ";"
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	426 %!test
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	427 %! tc = [];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	428 %! tc{1, 1} = "C:/code;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	429 %! tc{1, end+1} = "C:/code/meas;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	430 %! tc{1, end+1} = " C:/code/sim;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	431 %! tc{1, end+1} = "C:/code/utils;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	432 %! string = [tc{:}];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	433 %! c = textscan (string, "%s", "delimiter", ";");
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	434 %! for k = 1:numel (c{1})
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	435 %! lh = c{1}{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	436 %! rh = tc{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	437 %! rh(rh == ";") = "";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	438 %! rh = strtrim (rh);
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	439 %! assert (strcmp (lh, rh));
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	440 %! end
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	441
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	442 %% Whitespace test (bug #37333), adding multipleDelimsAsOne true arg
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	443 %!test
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	444 %! tc = [];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	445 %! tc{1, 1} = "C:/code;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	446 %! tc{1, end+1} = " C:/code/meas;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	447 %! tc{1, end+1} = "C:/code/sim;;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	448 %! tc{1, end+1} = "C:/code/utils;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	449 %! string = [tc{:}];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	450 %! c = textscan (string, "%s", "delimiter", ";", "multipleDelimsAsOne", 1);
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	451 %! for k = 1:numel (c{1})
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	452 %! lh = c{1}{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	453 %! rh = tc{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	454 %! rh(rh == ";") = "";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	455 %! rh = strtrim (rh);
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	456 %! assert (strcmp (lh, rh));
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	457 %! end
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	458
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	459 %% Whitespace test (bug #37333), adding multipleDelimsAsOne false arg
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	460 %!test
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	461 %! tc = [];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	462 %! tc{1, 1} = "C:/code;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	463 %! tc{1, end+1} = " C:/code/meas;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	464 %! tc{1, end+1} = "C:/code/sim;;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	465 %! tc{1, end+1} = "";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	466 %! tc{1, end+1} = "C:/code/utils;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	467 %! string = [tc{:}];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	468 %! c = textscan (string, "%s", "delimiter", ";", "multipleDelimsAsOne", 0);
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	469 %! for k = 1:numel (c{1})
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	470 %! lh = c{1}{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	471 %! rh = tc{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	472 %! rh(rh == ";") = "";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	473 %! rh = strtrim (rh);
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	474 %! assert (strcmp (lh, rh));
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	475 %! end
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	476
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	477 %% Whitespace test (bug #37333) whitespace "" arg
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	478 %!test
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	479 %! tc = [];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	480 %! tc{1, 1} = "C:/code;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	481 %! tc{1, end+1} = " C:/code/meas;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	482 %! tc{1, end+1} = "C:/code/sim;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	483 %! tc{1, end+1} = "C:/code/utils;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	484 %! string = [tc{:}];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	485 %! c = textscan (string, "%s", "delimiter", ";", "whitespace", "");
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	486 %! for k = 1:numel (c{1})
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	487 %! lh = c{1}{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	488 %! rh = tc{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	489 %! rh(rh == ";") = "";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	490 %! assert (strcmp (lh, rh));
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	491 %! end
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	492
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	493 %% Whitespace test (bug #37333), whitespace " " arg
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	494 %!test
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	495 %! tc = [];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	496 %! tc{1, 1} = "C:/code;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	497 %! tc{1, end+1} = " C:/code/meas;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	498 %! tc{1, end+1} = "C:/code/sim;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	499 %! tc{1, end+1} = "C:/code/utils;";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	500 %! string = [tc{:}];
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	501 %! c = textscan (string, "%s", "delimiter", ";", "whitespace", " ");
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	502 %! for k = 1:numel (c{1})
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	503 %! lh = c{1}{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	504 %! rh = tc{k};
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	505 %! rh(rh == ";") = "";
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	506 %! rh = strtrim (rh);
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	507 %! assert (strcmp (lh, rh));
6251fa48d28b textscan.m: various whitespace & delimiter tests added Andy Register <andy.register@gatech.edu> parents: 15263 diff changeset	508 %! end
16060 f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	509
16305 23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	510 %% Test reading from a real file
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	511 %!test
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	512 %! f = tmpnam ();
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	513 %! fid = fopen (f, "w+");
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	514 %! d = rand (1, 4);
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	515 %! fprintf (fid, " %f %f %f %f ", d);
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	516 %! fseek (fid, 0, "bof");
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	517 %! A = textscan (fid, "%f %f");
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	518 %! fclose (fid);
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	519 %! unlink (f);
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	520 %! assert (A{1}, [d(1); d(3)], 1e-6);
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	521 %! assert (A{2}, [d(2); d(4)], 1e-6);
23636765e00a textscan.m: re-enable reading from file id, test added (bug #38517) Philip Nienhuis <prnienhuis@users.sf.net> parents: 16060 diff changeset	522
16060 f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	523 %!error <missing or illegal value for> textread (file_in_loadpath ("textscan.m"), "", "headerlines")
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	524 %!error <missing or illegal value for> textread (file_in_loadpath ("textscan.m"), "", "headerlines", 'hh')
f837bdd535f7 textscan.m: catch wrong headerlines values, tests added Philip Nienhuis <prnienhuis@users.sf.net> parents: 15872 diff changeset	525 %!error <character value required for> textread (file_in_loadpath ("textscan.m"), "", "endofline", true)

Mercurial > hg > octave-nkf

annotate scripts/io/textscan.m @ 16311:9c4ac8f25a8c