Mercurial > octave-nkf

annotate scripts/io/strread.m @ 14213:a022c04f68cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace to-be-deprecated strmatch occurrences with alternate code. * strread.m, textscan.m, pkg.m: Replace to-be-deprecated strmatch occurrences with alternate code.
author Rik <octave@nomad.inbox5.com>
date Wed, 18 Jan 2012 21:14:36 -0800
parents 72c96de7a403
children ec99c8c185be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 14119
diff changeset
1 ## Copyright (C) 2009-2012 Eric Chassande-Mottin, CNRS (France)
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 14119
diff changeset
2 ## Copyright (C) 2012 Philip Nienhuis
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
3 ##
11104
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
4 ## This file is part of Octave.
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
5 ##
11104
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
6 ## Octave is free software; you can redistribute it and/or modify it
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
7 ## under the terms of the GNU General Public License as published by
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
8 ## the Free Software Foundation; either version 3 of the License, or (at
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
9 ## your option) any later version.
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
10 ##
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
11 ## Octave is distributed in the hope that it will be useful, but
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
14 ## General Public License for more details.
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
15 ##
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
16 ## You should have received a copy of the GNU General Public License
11104
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 10846
diff changeset
17 ## along with Octave; see the file COPYING. If not, see
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
18 ## <http://www.gnu.org/licenses/>.
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
19
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
20 ## -*- texinfo -*-
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
21 ## @deftypefn {Function File} {[@var{a}, @dots{}] =} strread (@var{str})
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
22 ## @deftypefnx {Function File} {[@var{a}, @dots{}] =} strread (@var{str}, @var{format})
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
23 ## @deftypefnx {Function File} {[@var{a}, @dots{}] =} strread (@var{str}, @var{format}, @var{format_repeat})
11150
564e998017f5 docstring fixes
John W. Eaton <jwe@octave.org>
parents: 11147
diff changeset
24 ## @deftypefnx {Function File} {[@var{a}, @dots{}] =} strread (@var{str}, @var{format}, @var{prop1}, @var{value1}, @dots{})
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
25 ## @deftypefnx {Function File} {[@var{a}, @dots{}] =} strread (@var{str}, @var{format}, @var{format_repeat}, @var{prop1}, @var{value1}, @dots{})
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
26 ## Read data from a string.
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
27 ##
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
28 ## The string @var{str} is split into words that are repeatedly matched to the
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
29 ## specifiers in @var{format}. The first word is matched to the first
12879
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
30 ## specifier, the second to the second specifier and so forth. If there are
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
31 ## more words than specifiers, the process is repeated until all words have
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
32 ## been processed.
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
33 ##
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
34 ## The string @var{format} describes how the words in @var{str} should be
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
35 ## parsed.
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
36 ## It may contain any combination of the following specifiers:
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
37 ## @table @code
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
38 ## @item %s
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
39 ## The word is parsed as a string.
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
40 ##
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
41 ## @itemx %f
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
42 ## @itemx %n
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
43 ## The word is parsed as a number and converted to double.
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
44 ##
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
45 ## @item %d
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
46 ## @itemx %u
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
47 ## The word is parsed as a number and converted to int32.
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
48 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
49 ## @item %*', '%*f', '%*s
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
50 ## The word is skipped.
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
51 ##
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
52 ## For %s and %d, %f, %n, %u and the associated %*s @dots{} specifiers an
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
53 ## optional width can be specified as %Ns, etc. where N is an integer > 1.
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
54 ## For %f, format specifiers like %N.Mf are allowed.
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
55 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
56 ## @item literals
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
57 ## In addition the format may contain literal character strings; these will be
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
58 ## skipped during reading.
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
59 ## @end table
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
60 ##
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
61 ## Parsed word corresponding to the first specifier are returned in the first
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
62 ## output argument and likewise for the rest of the specifiers.
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
63 ##
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
64 ## By default, @var{format} is @t{"%f"}, meaning that numbers are read from
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
65 ## @var{str}. This will do if @var{str} contains only numeric fields.
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
66 ##
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
67 ## For example, the string
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
68 ##
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
69 ## @example
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
70 ## @group
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
71 ## @var{str} = "\
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
72 ## Bunny Bugs 5.5\n\
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
73 ## Duck Daffy -7.5e-5\n\
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
74 ## Penguin Tux 6"
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
75 ## @end group
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
76 ## @end example
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
77 ##
10846
a4f482e66b65 Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents: 10821
diff changeset
78 ## @noindent
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
79 ## can be read using
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
80 ##
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
81 ## @example
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
82 ## [@var{a}, @var{b}, @var{c}] = strread (@var{str}, "%s %s %f");
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
83 ## @end example
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
84 ##
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
85 ## Optional numeric argument @var{format_repeat} can be used for
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
86 ## limiting the number of items read:
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
87 ## @table @asis
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
88 ## @item -1
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
89 ## (default) read all of the string until the end.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
90 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
91 ## @item N
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
92 ## Read N times @var{nargout} items. 0 (zero) is an acceptable
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
93 ## value for @var{format_repeat}.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
94 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
95 ## @end table
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
96 ##
11575
d6619410e79c Spellcheck documentation before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents: 11564
diff changeset
97 ## The behavior of @code{strread} can be changed via property-value
11147
a81994607ca0 document textscan and textread
John W. Eaton <jwe@octave.org>
parents: 11127
diff changeset
98 ## pairs. The following properties are recognized:
a81994607ca0 document textscan and textread
John W. Eaton <jwe@octave.org>
parents: 11127
diff changeset
99 ##
11595
5ec6aa05638d Prevent doubled quotes around @table items in Info.
Rik <octave@nomad.inbox5.com>
parents: 11589
diff changeset
100 ## @table @asis
11147
a81994607ca0 document textscan and textread
John W. Eaton <jwe@octave.org>
parents: 11127
diff changeset
101 ## @item "commentstyle"
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
102 ## Parts of @var{str} are considered comments and will be skipped.
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
103 ## @var{value} is the comment style and can be any of the following.
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
104 ## @itemize
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
105 ## @item "shell"
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
106 ## Everything from @code{#} characters to the nearest end-of-line is skipped.
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
107 ##
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
108 ## @item "c"
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
109 ## Everything between @code{/*} and @code{*/} is skipped.
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
110 ##
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
111 ## @item "c++"
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
112 ## Everything from @code{//} characters to the nearest end-of-line is skipped.
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
113 ##
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
114 ## @item "matlab"
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
115 ## Everything from @code{%} characters to the nearest end-of-line is skipped.
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
116 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
117 ## @item user-supplied. Two options:
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
118 ## (1) One string, or 1x1 cell string: Skip everything to the right of it;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
119 ## (2) 2x1 cell string array: Everything between the left and right strings
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
120 ## is skipped.
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
121 ## @end itemize
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
122 ##
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
123 ## @item "delimiter"
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
124 ## Any character in @var{value} will be used to split @var{str} into words
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
125 ## (default value = any whitespace).
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
126 ##
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
127 ## @item "emptyvalue":
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
128 ## Value to return for empty numeric values in non-whitespace delimited data.
14119
94e2a76f1e5a doc: Final grammarcheck and spellcheck before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 14096
diff changeset
129 ## The default is NaN@. When the data type does not support NaN
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
130 ## (int32 for example), then default is zero.
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
131 ##
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
132 ## @item "multipledelimsasone"
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
133 ## Treat a series of consecutive delimiters, without whitespace in between,
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
134 ## as a single delimiter. Consecutive delimiter series need not be vertically
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
135 ## "aligned".
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
136 ##
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
137 ## @item "treatasempty"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
138 ## Treat single occurrences (surrounded by delimiters or whitespace) of the
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
139 ## string(s) in @var{value} as missing values.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
140 ##
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
141 ## @item "returnonerror"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
142 ## If @var{value} true (1, default), ignore read errors and return normally.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
143 ## If false (0), return an error.
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
144 ##
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
145 ## @item "whitespace"
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
146 ## Any character in @var{value} will be interpreted as whitespace and
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
147 ## trimmed; the string defining whitespace must be enclosed in double
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
148 ## quotes for proper processing of special characters like \t.
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
149 ## The default value for whitespace = " \b\r\n\t" (note the space).
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
150 ## Unless whitespace is set to '' (empty) AND at least one "%s" format
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
151 ## conversion specifier is supplied, a space is always part of whitespace.
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
152 ##
11150
564e998017f5 docstring fixes
John W. Eaton <jwe@octave.org>
parents: 11147
diff changeset
153 ## @end table
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
154 ##
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
155 ## @seealso{textscan, textread, load, dlmread, fscanf}
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
156 ## @end deftypefn
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
157
11469
c776f063fefe Overhaul m-script files to use common variable name between code and documentation.
Rik <octave@nomad.inbox5.com>
parents: 11343
diff changeset
158 function varargout = strread (str, format = "%f", varargin)
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
159
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
160 ## Check input
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
161 if (nargin < 1)
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
162 print_usage ();
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
163 endif
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11575
diff changeset
164
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
165 if (isempty (format))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
166 format = "%f";
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
167 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
168
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
169 if (! ischar (str) || ! ischar (format))
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 11469
diff changeset
170 error ("strread: STR and FORMAT arguments must be strings");
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
171 endif
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
172
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
173 ## Parse format string to compare number of conversion fields and nargout
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
174 nfields = length (strfind (format, "%")) - length (strfind (format, "%*"));
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
175 ## If str only has numeric fields, a (default) format ("%f") will do.
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
176 ## Otherwise:
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
177 if ((max (nargout, 1) != nfields) && ! strcmp (format, "%f"))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
178 error ("strread: the number of output variables must match that specified by FORMAT");
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
179 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
180
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
181 ## Check for format string repeat count
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
182 format_repeat_count = -1;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
183 if (nargin > 2 && isnumeric (varargin{1}))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
184 if (varargin{1} >= 0)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
185 format_repeat_count = varargin{1};
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
186 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
187 if (nargin > 3)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
188 varargin = varargin(2:end);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
189 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
190 varargin = {};
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
191 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
192 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
193
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
194 ## Parse options. First initialize defaults
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
195 comment_flag = false;
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
196 delimiter_str = "";
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
197 empty_str = "";
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
198 eol_char = "";
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
199 err_action = 0;
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
200 mult_dlms_s1 = false;
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
201 numeric_fill_value = NaN;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
202 white_spaces = " \b\r\n\t";
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
203 for n = 1:2:length (varargin)
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
204 switch (lower (varargin{n}))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
205 case "bufsize"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
206 ## We could synthesize this, but that just seems weird...
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
207 warning ('strread: property "bufsize" is not implemented');
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
208 case "commentstyle"
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
209 comment_flag = true;
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
210 switch (lower (varargin{n+1}))
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
211 case "c"
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
212 [comment_start, comment_end] = deal ("/*", "*/");
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
213 case "c++"
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
214 [comment_start, comment_end] = deal ("//", "eol_char");
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
215 case "shell"
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
216 [comment_start, comment_end] = deal ("#" , "eol_char");
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
217 case "matlab"
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
218 [comment_start, comment_end] = deal ("%" , "eol_char");
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
219 otherwise
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
220 if (ischar (varargin{n+1}) ||
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
221 (numel (varargin{n+1}) == 1 && iscellstr (varargin{n+1})))
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
222 [comment_start, comment_end] = deal (char (varargin{n+1}), "eol_char");
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
223 elseif (iscellstr (varargin{n+1}) && numel (varargin{n+1}) == 2)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
224 [comment_start, comment_end] = deal (varargin{n+1}{:});
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
225 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
226 ## FIXME - a user may have numeric values specified: {'//', 7}
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
227 ## this will lead to an error in the warning message
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
228 error ("strread: unknown or unrecognized comment style '%s'",
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
229 varargin{n+1});
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
230 endif
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
231 endswitch
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
232 case "delimiter"
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
233 delimiter_str = varargin{n+1};
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
234 if (strcmp (typeinfo (delimiter_str), "sq_string"))
13715
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
235 delimiter_str = do_string_escapes (delimiter_str);
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
236 endif
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
237 case "emptyvalue"
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
238 numeric_fill_value = varargin{n+1};
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
239 case "expchars"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
240 warning ('strread: property "expchars" is not implemented');
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
241 case "whitespace"
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
242 white_spaces = varargin{n+1};
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
243 if (strcmp (typeinfo (white_spaces), "sq_string"))
13715
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
244 white_spaces = do_string_escapes (white_spaces);
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
245 endif
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
246 ## The following parameters are specific to textscan and textread
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
247 case "endofline"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
248 eol_char = varargin{n+1};
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
249 if (strcmp (typeinfo (eol_char), "sq_string"))
13715
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
250 eol_char = do_string_escapes (eol_char);
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
251 endif
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
252 case "returnonerror"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
253 err_action = varargin{n+1};
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
254 case "multipledelimsasone"
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
255 mult_dlms_s1 = varargin{n+1};
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
256 case "treatasempty"
12879
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
257 if (iscellstr (varargin{n+1}))
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
258 empty_str = varargin{n+1};
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
259 elseif (ischar (varargin{n+1}))
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
260 empty_str = varargin(n+1);
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
261 else
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
262 error ('strread: "treatasempty" value must be string or cellstr');
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
263 endif
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
264 otherwise
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
265 warning ('strread: unknown property "%s"', varargin{n});
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
266 endswitch
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
267 endfor
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
268
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
269 ## First parse of FORMAT
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
270 if (strcmpi (strtrim (format), "%f"))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
271 ## Default format specified. Expand it (to desired nargout)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
272 fmt_words = cell (nargout, 1);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
273 fmt_words (1:nargout) = format;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
274 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
275 ## Determine the number of words per line as a first guess. Forms
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
276 ## like %f<literal>) (w/o delimiter in between) are fixed further on
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
277 format = strrep (format, "%", " %");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
278 fmt_words = regexp (format, '[^ ]+', 'match');
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
279 ## Format conversion specifiers following literals w/o space/delim
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
280 ## in between are separate now. Separate those w trailing literals
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
281 idy2 = find (! cellfun ("isempty", strfind (fmt_words, "%")));
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
282 a = strfind (fmt_words(idy2), "%");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
283 b = regexp (fmt_words(idy2), '[nfdus]', 'end');
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
284 for jj = 1:numel (a)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
285 ii = numel (a) - jj + 1;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
286 if (! (length (fmt_words{idy2(ii)}) == b{ii}(1)))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
287 ## Fix format_words
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
288 fmt_words(idy2(ii)+1 : end+1) = fmt_words(idy2(ii) : end);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
289 fmt_words{idy2(ii)} = fmt_words{idy2(ii)}(a{ii} : b{ii}(1));
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
290 fmt_words{idy2(ii)+1} = fmt_words{idy2(ii)+1}(b{ii}+1:end);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
291 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
292 endfor
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
293 endif
11127
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
294 num_words_per_line = numel (fmt_words);
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
295
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
296 ## Special handling for CRLF EOL character in str
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
297 if (! isempty (eol_char) && strcmp (eol_char, "\r\n"))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
298 ## Strip CR from CRLF sequences
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
299 str = strrep (str, "\r\n", "\n");
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
300 ## CR serves no further purpose in function
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
301 eol_char = "\n";
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
302 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
303
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
304 ## Remove comments in str
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
305 if (comment_flag)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
306 ## Expand 'eol_char' here, after option processing which may have set value
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
307 comment_end = regexprep (comment_end, 'eol_char', eol_char);
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
308 cstart = strfind (str, comment_start);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
309 cstop = strfind (str, comment_end);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
310 ## Treat end of string as additional comment stop
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
311 if (isempty (cstop) || cstop(end) != length (str))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
312 cstop(end+1) = length (str);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
313 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
314 if (! isempty (cstart))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
315 ## Ignore nested openers.
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
316 [idx, cidx] = unique (lookup (cstop, cstart), "first");
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
317 if (idx(end) == length (cstop))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
318 cidx(end) = []; # Drop the last one if orphaned.
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
319 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
320 cstart = cstart(cidx);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
321 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
322 if (! isempty (cstop))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
323 ## Ignore nested closers.
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
324 [idx, cidx] = unique (lookup (cstart, cstop), "first");
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
325 if (idx(1) == 0)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
326 cidx(1) = []; # Drop the first one if orphaned.
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
327 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
328 cstop = cstop(cidx);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
329 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
330 len = length (str);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
331 c2len = length (comment_end);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
332 str = cellslices (str, [1, cstop + c2len], [cstart - 1, len]);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
333 str = [str{:}];
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
334 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
335
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
336 if (! isempty (white_spaces))
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
337 ## For numeric fields, whitespace is always a delimiter, but not for text fields
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
338 if (isempty (strfind (format, "%s")))
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
339 ## Add whitespace to delimiter set
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
340 delimiter_str = unique ([white_spaces delimiter_str]);
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
341 else
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
342 ## Remove any delimiter chars from white_spaces list
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
343 white_spaces = setdiff (white_spaces, delimiter_str);
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
344 endif
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
345 endif
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
346 if (isempty (delimiter_str))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
347 delimiter_str = " ";
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
348 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
349 if (! isempty (eol_char))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
350 ## Add eol_char to delimiter collection
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
351 delimiter_str = unique ([delimiter_str eol_char]);
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
352 ## .. and remove it from whitespace collection
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
353 white_spaces = strrep (white_spaces, eol_char, '');
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
354 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
355
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
356 pad_out = 0;
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
357 ## Trim whitespace if needed
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
358 if (! isempty (white_spaces))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
359 ## Check if trailing "\n" might signal padding output arrays to equal size
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
360 ## before it is trimmed away below
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
361 if ((str(end) == 10) && (nargout > 1))
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
362 pad_out = 1;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
363 endif
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
364 ## Condense all repeated whitespace into one single space
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
365 ## FIXME: this will also fold repeated whitespace in a char field
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
366 rxp_wsp = sprintf ("[%s]+", white_spaces);
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
367 str = regexprep (str, rxp_wsp, ' ');
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
368 ## Remove possible leading space at string
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
369 if (str(1) == 32)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
370 str = str(2:end);
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
371 endif
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
372 ## Check for single delimiter followed/preceded by whitespace
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
373 ## FIXME: Double strrep on str is enormously expensive of CPU time.
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
374 ## Can this be eliminated
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
375 if (! isempty (delimiter_str))
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
376 dlmstr = setdiff (delimiter_str, " ");
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
377 rxp_dlmwsp = sprintf ("( [%s]|[%s] )", dlmstr, dlmstr);
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
378 str = regexprep (str, rxp_dlmwsp, delimiter_str(1));
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
379 endif
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
380 ## FIXME: Double strrep on str is enormously expensive of CPU time.
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
381 ## Can this be eliminated
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
382 ## Wipe leading and trailing whitespace on each line (it may be delimiter too)
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
383 if (! isempty (eol_char))
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
384 str = strrep (str, [eol_char " "], eol_char);
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
385 str = strrep (str, [" " eol_char], eol_char);
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
386 endif
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
387 endif
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11575
diff changeset
388
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
389 ## Split 'str' into words
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
390 words = split_by (str, delimiter_str, mult_dlms_s1, eol_char);
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
391 if (! isempty (white_spaces))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
392 ## Trim leading and trailing white_spaces
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
393 ## FIXME: Is this correct? strtrim clears what matches isspace(), not
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
394 ## necessarily what is in white_spaces.
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
395 words = strtrim (words);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
396 endif
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
397 num_words = numel (words);
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
398 ## First guess at number of lines in file (ignoring leading/trailing literals)
12879
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
399 num_lines = ceil (num_words / num_words_per_line);
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11575
diff changeset
400
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
401 ## Replace TreatAsEmpty char sequences by empty strings
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
402 if (! isempty (empty_str))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
403 for ii = 1:numel (empty_str)
14213
a022c04f68cc Replace to-be-deprecated strmatch occurrences with alternate code.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
404 idz = strncmp (empty_str{ii}, words, length (empty_str{ii}));
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
405 words(idz) = {""};
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
406 endfor
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
407 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
408
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
409 ## fmt_words has been split properly now, but words{} has only been split on
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
410 ## delimiter positions.
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
411 ## As numeric fields can also be separated by whitespace, more splits may be
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
412 ## needed.
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
413 ## We also don't know the number of lines (as EndOfLine may have been set to
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
414 ## "" (empty) by the caller).
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
415 ##
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
416 ## We also may have to cope with 3 cases as far as literals go:
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
417 ## A: Trailing literals (%f<literal>) w/o delimiter in between.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
418 ## B: Leading literals (<literal>%f) w/o delimiter in between.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
419 ## C. Skipping leftover parts of specified skip fields (%*N )
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
420 ## Some words columns may have to be split further to fix these.
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
421
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
422 ## Find indices and pointers to possible literals in fmt_words
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
423 idf = cellfun ("isempty", strfind (fmt_words, "%"));
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
424 ## Find indices and pointers to conversion specifiers with fixed width
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
425 idg = ! cellfun ("isempty", regexp (fmt_words, '%\*?\d'));
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
426 idy = find (idf | idg);
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
427 ## Find indices to numeric conversion specifiers
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
428 idn = ! cellfun ("isempty", regexp (fmt_words, "%[dnfu]"));
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
429
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
430 ## If needed, split up columns in three steps:
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
431 if (! isempty (idy))
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
432 ## Try-catch because complexity of strings to read can be infinite
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
433 try
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
434
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
435 ## 1. Assess "period" in the split-up words array ( < num_words_per_line).
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
436 ## Could be done using EndOfLine but that prohibits EndOfLine = "" option.
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
437 ## Alternative below goes by simply parsing a first grab of words
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
438 ## and counting words until the fmt_words array is exhausted:
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
439 iwrd = 1; iwrdp = 0; iwrdl = length (words{iwrd});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
440 for ii = 1:numel (fmt_words)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
441
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
442 if (idf(ii))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
443 ## Literal expected
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
444 if (isempty (strfind (fmt_words{ii}, words(iwrd))))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
445 ## Not found in current word; supposed to be in next word
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
446 ++iwrd; iwrdp = 0;
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
447 if (ii < numel (fmt_words))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
448 iwrdl = length (words{iwrd});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
449 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
450 else
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
451 ## Found it in current word. Subtract literal length
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
452 iwrdp += length (fmt_words{ii});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
453 if (iwrdp > iwrdl)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
454 ## Parse error. Literal extends beyond delimiter (word boundary)
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
455 warning ("strread: literal '%s' (fmt spec # %d) does not match data", ...
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
456 fmt_words{ii}, ii);
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
457 ## Word assumed to be completely "used up". Next word
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
458 ++iwrd; iwrdp = 0;
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
459 if (ii < numel (fmt_words))
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
460 iwrdl = length (words{iwrd});
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
461 endif
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
462 elseif (iwrdp == iwrdl)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
463 ## Word completely "used up". Next word
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
464 ++iwrd; iwrdp = 0;
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
465 if (ii < numel (fmt_words))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
466 iwrdl = length (words{iwrd});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
467 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
468 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
469 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
470
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
471 elseif (idg(ii))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
472 ## Fixed width specifier (%N or %*N): read just a part of word
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
473 iwrdp += floor ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
474 (str2double (fmt_words{ii}(regexp(fmt_words{ii}, '\d') : end-1)));
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
475 if (iwrdp > iwrdl)
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
476 ## Match error. Field extends beyond word boundary.
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
477 warning ...
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
478 ("strread: field width '%s' (fmt spec # %d) extends beyond actual word limit", ...
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
479 fmt_words{ii}, ii);
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
480 ## Assume word to be completely "used up". Next word
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
481 ++iwrd; iwrdp = 0; iwrdl = length (words{iwrd});
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
482 elseif (iwrdp == iwrdl)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
483 ## Word completely "used up". Next word
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
484 ++iwrd; iwrdp = 0; iwrdl = length (words{iwrd});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
485 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
486
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
487 else
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
488 ## A simple format conv. specifier. Either (1) uses rest of word, or
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
489 ## (2) is squeezed between current iwrdp and next literal, or (3) uses
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
490 ## next word. (3) is already taken care of. So just check (1) & (2)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
491 if (ii < numel (fmt_words) && idf(ii+1))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
492 ## Next fmt_word is a literal...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
493 if (! index (words{iwrd}(iwrdp+1:end), fmt_words{ii+1}))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
494 ## ...but not found in current word => field uses rest of word
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
495 ++iwrd; iwrdp = 0; iwrdl = length (words{iwrd});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
496 else
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
497 ## ..or it IS found. Add inferred width of current conversion field
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
498 iwrdp += index (words{iwrd}(iwrdp+1:end), fmt_words{ii+1}) - 1;
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
499 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
500 elseif (iwrdp < iwrdl)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
501 ## No bordering literal to the right => field occupies (rest of) word
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
502 ++iwrd; iwrdp = 0;
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
503 if (ii < numel (fmt_words))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
504 iwrdl = length (words{iwrd});
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
505 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
506 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
507
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
508 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
509 endfor
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
510 ## Done
12940
3509cf60d1f6 strread.m: %Ns conversion format now honors user specified width (Bug #33950).
Philip Nienhuis <prnienhuis@@users.sf.net>
parents: 12931
diff changeset
511 words_period = max (iwrd - 1, 1);
12879
c3b305e7e59f maint: Reverse previous changeset 875c735c0929
Rik <octave@nomad.inbox5.com>
parents: 12878
diff changeset
512 num_lines = ceil (num_words / words_period);
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
513
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
514 ## 2. Pad words array so that it can be reshaped
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
515 tmp_lines = ceil (num_words / words_period);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
516 num_words_padded = tmp_lines * words_period - num_words;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
517 if (num_words_padded)
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
518 words = [words'; cell(num_words_padded, 1)];
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
519 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
520 words = reshape (words, words_period, tmp_lines);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
521
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
522 ## 3. Do the column splitting on rectangular words array
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
523 icol = 1; ii = 1; # icol = current column, ii = current fmt_word
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
524 while (ii <= num_words_per_line)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
525
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
526 ## Check if fmt_words(ii) contains a literal or fixed-width
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
527 if ((idf(ii) || idg(ii)) && (rows(words) < num_words_per_line))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
528 if (idf(ii))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
529 s = strfind (words(icol, 1), fmt_words{ii});
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
530 if (isempty (s{:}))
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
531 error ("strread: Literal '%s' not found in column %d", fmt_words{ii}, icol);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
532 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
533 s = s{:}(1);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
534 e = s(1) + length (fmt_words{ii}) - 1;
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
535 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
536 if (! strcmp (fmt_words{ii}, words{icol, 1}))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
537 ## Column doesn't exactly match literal => split needed. Insert a column
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
538 words(icol+1:end+1, :) = words(icol:end, :);
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
539 ## Watch out for empty cells
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
540 jptr = find (! cellfun ("isempty", words(icol, :)));
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
541
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
542 ## Distinguish leading or trailing literals
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
543 if (! idg(ii) && ! isempty (s) && s(1) == 1)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
544 ## Leading literal. Assign literal to icol, paste rest in icol + 1
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
545 ## Apply only to those cells that do have something beyond literal
12931
cefd568ea073 Replace function handles with function names in cellfun calls for 15% speedup.
Rik <octave@nomad.inbox5.com>
parents: 12914
diff changeset
546 jptr = find (cellfun("length", words(icol+1, jptr), ...
cefd568ea073 Replace function handles with function names in cellfun calls for 15% speedup.
Rik <octave@nomad.inbox5.com>
parents: 12914
diff changeset
547 "UniformOutput", false) > e(1));
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
548 words(icol+1, :) = {""};
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
549 words(icol+1, jptr) = cellfun ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
550 (@(x) substr(x, e(1)+1, length(x)-e(1)), words(icol, jptr), ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
551 "UniformOutput", false);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
552 words(icol, jptr) = fmt_words{ii};
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
553
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
554 else
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
555 if (! idg(ii) && ! isempty (strfind (fmt_words{ii-1}, "%s")))
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
556 ## Trailing literal. If preceding format == '%s' this is an error
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
557 warning ("Ambiguous '%s' specifier next to literal in column %d", icol);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
558 elseif (idg(ii))
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
559 ## Current field = fixed width. Strip into icol, rest in icol+1
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
560 wdth = floor (str2double (fmt_words{ii}(regexp(fmt_words{ii}, ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
561 '\d') : end-1)));
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
562 words(icol+1, jptr) = cellfun (@(x) x(wdth+1:end),
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
563 words(icol,jptr), "UniformOutput", false);
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
564 words(icol, jptr) = strtrunc (words(icol, jptr), wdth);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
565 else
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
566 ## FIXME: this assumes char(254)/char(255) won't occur in input!
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
567 clear wrds;
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
568 wrds(1:2:2*numel (words(icol, jptr))) = ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
569 strrep (words(icol, jptr), fmt_words{ii}, ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
570 [char(255) char(254)]);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
571 wrds(2:2:2*numel (words(icol, jptr))-1) = char(255);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
572 wrds = strsplit ([wrds{:}], char(255));
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
573 words(icol, jptr) = ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
574 wrds(find (cellfun ("isempty", strfind (wrds, char(254)))));
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
575 wrds(find (cellfun ("isempty", strfind (wrds, char(254))))) ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
576 = char(255);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
577 words(icol+1, jptr) = strsplit (strrep ([wrds{2:end}], ...
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
578 char(254), fmt_words{ii}), char(255));
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
579 ## Former trailing literal may now be leading for next specifier
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
580 --ii;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
581 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
582 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
583 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
584
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
585 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
586 ## Conv. specifier. Peek if next fmt_word needs split from current column
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
587 if (ii < num_words_per_line)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
588 if (idf(ii+1) && (! isempty (strfind (words{icol, 1}, fmt_words{ii+1}))))
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
589 --icol;
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
590 elseif (idg(ii+1))
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
591 --icol;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
592 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
593 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
594 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
595 ## Next fmt_word, next column
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
596 ++ii; ++icol;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
597 endwhile
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
598
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
599 ## Done. Reshape words back into 1 long vector and strip padded empty words
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
600 words = reshape (words, 1, numel (words))(1 : end-num_words_padded);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
601
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
602 catch
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
603 warning ("strread: unable to parse text or file with given format string");
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
604 return;
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
605
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
606 end_try_catch
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
607 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
608
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
609 ## For each specifier, process corresponding column
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
610 k = 1;
11127
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
611 for m = 1:num_words_per_line
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
612 try
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
613 if (format_repeat_count < 0)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
614 data = words(m:num_words_per_line:end);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
615 elseif (format_repeat_count == 0)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
616 data = {};
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
617 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
618 lastline = ...
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
619 min (num_words_per_line * format_repeat_count + m - 1, numel (words));
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
620 data = words(m:num_words_per_line:lastline);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
621 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
622
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
623 ## Map to format
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
624 ## FIXME - add support for formats like "<%s>", "%[a-zA-Z]"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
625 ## Someone with regexp experience is needed.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
626 switch fmt_words{m}(1:min (2, length (fmt_words{m})))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
627 case "%s"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
628 if (pad_out)
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
629 data(end+1:num_lines) = {""};
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
630 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
631 varargout{k} = data';
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
632 k++;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
633 case {"%d", "%u", "%f", "%n"}
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
634 n = cellfun ("isempty", data);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
635 ### FIXME - erroneously formatted data lead to NaN, not an error
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
636 data = str2double (data);
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
637 if (! isempty (regexp (fmt_words{m}, "%[du]")))
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
638 ## Cast to integer
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
639 ## FIXME: NaNs will be transformed into zeros
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
640 data = int32 (data);
13176
9b8e786bbf3c maint: use specific endif, endfor tokens instead of simple end
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
641 endif
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
642 data(n) = numeric_fill_value;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
643 if (pad_out)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
644 data(end+1:num_lines) = numeric_fill_value;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
645 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
646 varargout{k} = data.';
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
647 k++;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
648 case {"%0", "%1", "%2", "%3", "%4", "%5", "%6", "%7", "%8", "%9"}
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
649 nfmt = strsplit (fmt_words{m}(2:end-1), '.');
12873
e8c8e118a1e6 Small touchups to textscan and strread revamp
Rik <octave@nomad.inbox5.com>
parents: 12866
diff changeset
650 swidth = str2double (nfmt{1});
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
651 switch fmt_words{m}(end)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
652 case {"d", "u", "f", "n%"}
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
653 n = cellfun ("isempty", data);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
654 ### FIXME - erroneously formatted data lead to NaN, not an error
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
655 ### => ReturnOnError can't be implemented for numeric data
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
656 data = str2double (strtrunc (data, swidth));
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
657 data(n) = numeric_fill_value;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
658 if (pad_out)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
659 data(end+1:num_lines) = numeric_fill_value;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
660 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
661 if (numel (nfmt) > 1)
12873
e8c8e118a1e6 Small touchups to textscan and strread revamp
Rik <octave@nomad.inbox5.com>
parents: 12866
diff changeset
662 sprec = str2double (nfmt{2});
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
663 data = 10^-sprec * round (10^sprec * data);
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
664 elseif (! isempty (regexp (fmt_words{m}, "[du]")))
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
665 ## Cast to integer
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
666 ## FIXME: NaNs will be transformed into zeros
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
667 data = int32 (data);
13176
9b8e786bbf3c maint: use specific endif, endfor tokens instead of simple end
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
668 endif
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
669 varargout{k} = data.';
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
670 k++;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
671 case "s"
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
672 if (pad_out)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
673 data(end+1:num_lines) = {""}
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
674 endif
12940
3509cf60d1f6 strread.m: %Ns conversion format now honors user specified width (Bug #33950).
Philip Nienhuis <prnienhuis@@users.sf.net>
parents: 12931
diff changeset
675 varargout{k} = strtrunc (data, swidth)';
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
676 k++;
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
677 otherwise
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
678 endswitch
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
679 case {"%*", "%*s"}
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
680 ## skip the word
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
681 otherwise
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
682 ## Ensure descriptive content is consistent.
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
683 ## Test made a bit lax to accomodate for incomplete last lines
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
684 n = find (! cellfun ("isempty", data));
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
685 if (numel (unique (data(n))) > 1
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
686 || ! strcmpi (unique (data), fmt_words{m}))
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
687 error ("strread: FORMAT does not match data");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
688 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
689 endswitch
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
690 catch
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
691 ## As strread processes columnwise, ML-compatible error processing
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
692 ## (row after row) is not feasible. In addition Octave sets unrecognizable
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
693 ## numbers to NaN w/o error. But maybe Octave is better in this respect.
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
694 if (err_action)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
695 ## Just try the next column where ML bails out
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
696 else
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
697 rethrow (lasterror);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
698 endif
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
699 end_try_catch
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
700 endfor
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
701
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
702 endfunction
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
703
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
704 function out = split_by (text, sep, mult_dlms_s1, eol_char)
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
705
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
706 ## Check & if needed, process MultipleDelimsAsOne parameter
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
707 if (mult_dlms_s1)
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
708 mult_dlms_s1 = true;
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
709 ## FIXME: Should re-implement strsplit() function here in order
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
710 ## to avoid strrep on megabytes of data.
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
711 ## If \n is in sep collection we need to enclose it in text
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
712 ## to avoid it being included in consecutive delim series
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
713 enchr = ' ';
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
714 ## However watch out if eol_char is also in delimiters
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
715 if (index (sep, eol_char)); enchr = char(255); endif
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
716 text = strrep (text, eol_char, [enchr eol_char enchr]);
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
717 else
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
718 mult_dlms_s1 = false;
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
719 endif
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
720
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
721 ## Split text string along delimiters
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
722 out = strsplit (text, sep, mult_dlms_s1);
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
723 if (index (sep, eol_char)); out = strrep (out, char(255), ''); endif
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
724 ## In case of trailing delimiter, strip stray last empty word
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
725 if (!isempty (out) && any (sep == text(end)))
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
726 out(end) = [];
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
727 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 12940
diff changeset
728
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
729 ## Empty cells converted to empty cellstrings.
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
730 out(cellfun ("isempty", out)) = {""};
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
731
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
732 endfunction
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
733
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
734
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
735 %!test
11343
5e5c513ea4c5 strread.m: Don't require space between format specifiers.
Ben Abbott <bpabbott@mac.com>
parents: 11150
diff changeset
736 %! [a, b] = strread ("1 2", "%f%f");
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
737 %! assert (a, 1);
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
738 %! assert (b, 2);
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
739
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
740 %!test
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
741 %! str = '';
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
742 %! a = rand (10, 1);
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
743 %! b = char (randi ([65, 85], 10, 1));
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
744 %! for k = 1:10
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
745 %! str = sprintf ('%s %.6f %s\n', str, a(k), b(k));
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
746 %! endfor
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
747 %! [aa, bb] = strread (str, '%f %s');
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
748 %! assert (a, aa, 1e-6);
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
749 %! assert (cellstr (b), bb);
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
750
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
751 %!test
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
752 %! str = '';
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
753 %! a = rand (10, 1);
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
754 %! b = char (randi ([65, 85], 10, 1));
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
755 %! for k = 1:10
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
756 %! str = sprintf ('%s %.6f %s\n', str, a(k), b(k));
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
757 %! endfor
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
758 %! aa = strread (str, '%f %*s');
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
759 %! assert (a, aa, 1e-6);
9746
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
760
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
761 %!test
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
762 %! str = sprintf ('/* this is\nacomment*/ 1 2 3');
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
763 %! a = strread (str, '%f', 'commentstyle', 'c');
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
764 %! assert (a, [1; 2; 3]);
31a22d48f41f scripts/io/strread.m scripts/io/textread.m: new functions
Soren Hauberg <hauberg@gmail.com>
parents:
diff changeset
765
11127
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
766 %!test
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
767 %! str = "# comment\n# comment\n1 2 3";
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
768 %! [a, b] = strread (str, '%n %s', 'commentstyle', 'shell', 'endofline', "\n");
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
769 %! assert (a, [1; 3]);
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
770 %! assert (b, {"2"});
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
771
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
772 %!test
11127
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
773 %! str = sprintf ("Tom 100 miles/hr\nDick 90 miles/hr\nHarry 80 miles/hr");
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
774 %! fmt = "%s %f miles/hr";
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
775 %! c = cell (1, 2);
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
776 %! [c{:}] = strread (str, fmt);
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
777 %! assert (c{1}, {"Tom"; "Dick"; "Harry"})
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
778 %! assert (c{2}, [100; 90; 80])
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
779
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
780 %!test
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
781 %! a = strread ("a b c, d e, , f", "%s", "delimiter", ",");
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
782 %! assert (a, {"a b c"; "d e"; ""; "f"});
64728cd28d7a strread.m: Improve compatibility with Matlab.
Ben Abbott <bpabbott@mac.com>
parents: 11120
diff changeset
783
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
784 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
785 %! # Bug #33536
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
786 %! [a, b, c] = strread ("1,,2", "%s%s%s", "delimiter", ",");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
787 %! assert (a{1}, '1');
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
788 %! assert (b{1}, '');
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
789 %! assert (c{1}, '2');
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
790
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
791 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
792 %! # Bug #33536
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
793 %! a = strread ("[SomeText]", "[%s", "delimiter", "]");
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
794 %! assert (a{1}, "SomeText");
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
795
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
796 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
797 %! dat = "Data file.\r\n= = = = =\r\nCOMPANY : <Company name>\r\n";
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
798 %! a = strread (dat, "%s", 'delimiter', "\n", 'whitespace', '', 'endofline', "\r\n");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
799 %! assert (a{2}, "= = = = =");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
800 %! assert (double (a{3}(end-5:end)), [32 110 97 109 101 62]);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
801
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
802 %!test
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
803 %! [a, b, c, d] = strread ("1,2,3,,5,6", "%d%f%d%f", 'delimiter', ',');
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
804 %! assert (c, int32 (3));
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
805 %! assert (d, NaN);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
806
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
807 %!test
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
808 %! [a, b, c, d] = strread ("1,2,3,,5,6\n", "%d%d%f%d", 'delimiter', ',');
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
809 %! assert (c, [3; NaN]);
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
810 %! assert (d, int32 ([0; 0]));
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
811
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
812 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
813 %! # Default format (= %f)
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
814 %1 [a, b, c] = strread ("0.12 0.234 0.3567");
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
815 %1 assert (a, 0.12);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
816 %1 assert (b, 0.234);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
817 %1 assert (c, 0.3567);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
818
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
819 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
820 %! [a, b] = strread('0.41 8.24 3.57 6.24 9.27', "%f%f", 2, 'delimiter', ' ');
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
821 %1 assert (a, [0.41; 3.57]);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
822
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
823 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
824 %! # TreatAsEmpty
12914
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
825 %! [a, b, c, d] = strread ("1,2,3,NN,5,6\n", "%d%d%d%f", 'delimiter', ',', 'TreatAsEmpty', 'NN');
ac00ae83ea2e More compatibility improvements for textscan and strread
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12891
diff changeset
826 %! assert (c, int32 ([3; 0]));
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
827 %! assert (d, [NaN; NaN]);
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
828
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
829 %!test
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
830 %! # No delimiters at all besides EOL. Plain reading numbers & strings
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
831 %! str = "Text1Text2Text\nText398Text4Text\nText57Text";
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
832 %! [a, b] = strread (str, "Text%dText%1sText");
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
833 %! assert (a, int32 ([1; 398; 57]));
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
834 %! assert (b(1:2), {'2'; '4'});
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
835 %! assert (isempty (b{3}), true);
12866
fe6e2afcd9ee Revamp strread, textscan, textread functions for Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12469
diff changeset
836
12891
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
837 %% MultipleDelimsAsOne
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
838 %!test
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
839 %! str = "11, 12, 13,, 15\n21,, 23, 24, 25\n,, 33, 34, 35";
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
840 %! [a b c d] = strread (str, "%f %f %f %f", 'delimiter', ',', 'multipledelimsasone', 1, 'endofline', "\n");
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
841 %! assert (a', [11, 21, NaN]);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
842 %! assert (b', [12, 23, 33]);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
843 %! assert (c', [13, 24, 34]);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
844 %! assert (d', [15, 25, 35]);
f5a3f77d51aa strread.m, textscan.m: More Matlab compatability
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 12879
diff changeset
845
13715
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
846 %% delimiter as sq_string and dq_string
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
847 %!test
13715
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
848 %! assert (strread ("1\n2\n3", "%d", "delimiter", "\n"),
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
849 %! strread ("1\n2\n3", "%d", "delimiter", '\n'))
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
850
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
851 %% whitespace as sq_string and dq_string
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
852 %!test
13715
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
853 %! assert (strread ("1\b2\r3\b4\t5", "%d", "whitespace", "\b\r\n\t"),
f8eca611e18f When single-quoted, the strread() "delimiter", "endofline", and "whitespace"
Ben Abbott <bpabbott@mac.com>
parents: 13176
diff changeset
854 %! strread ("1\b2\r3\b4\t5", "%d", "whitespace", '\b\r\n\t'))
14096
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
855
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
856 %!test
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
857 %! str = "0.31 0.86 0.94\n 0.60 0.72 0.87";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
858 %! fmt = "%f %f %f";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
859 %! args = {"delimiter", " ", "endofline", "\n", "whitespace", " "};
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
860 %! [a, b, c] = strread (str, fmt, args {:});
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
861 %! assert (a, [0.31; 0.60], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
862 %! assert (b, [0.86; 0.72], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
863 %! assert (c, [0.94; 0.87], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
864
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
865 %!test
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
866 %! str = "0.31,0.86,0.94\n0.60,0.72,0.87";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
867 %! fmt = "%f %f %f";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
868 %! args = {"delimiter", ",", "endofline", "\n", "whitespace", " "};
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
869 %! [a, b, c] = strread (str, fmt, args {:});
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
870 %! assert (a, [0.31; 0.60], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
871 %! assert (b, [0.86; 0.72], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
872 %! assert (c, [0.94; 0.87], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
873
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
874 %!test
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
875 %! str = "0.31 0.86 0.94\n 0.60 0.72 0.87";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
876 %! fmt = "%f %f %f";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
877 %! args = {"delimiter", ",", "endofline", "\n", "whitespace", " "};
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
878 %! [a, b, c] = strread (str, fmt, args {:});
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
879 %! assert (a, [0.31; 0.60], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
880 %! assert (b, [0.86; 0.72], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
881 %! assert (c, [0.94; 0.87], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
882
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
883 %!test
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
884 %! str = "0.31, 0.86, 0.94\n 0.60, 0.72, 0.87";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
885 %! fmt = "%f %f %f";
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
886 %! args = {"delimiter", ",", "endofline", "\n", "whitespace", " "};
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
887 %! [a, b, c] = strread (str, fmt, args {:});
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
888 %! assert (a, [0.31; 0.60], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
889 %! assert (b, [0.86; 0.72], 0.01)
153581342e47 Always separate numeric fields by whitespace too; gracefully catch too wide literals & fixed width format conversion specifiers
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 13715
diff changeset
890 %! assert (c, [0.94; 0.87], 0.01)