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

annotate scripts/io/textscan.m @ 19627:446c46af4b42 stable

strip trailing whitespace from most source files * Makefile.am, NEWS, build-aux/common.mk, configure.ac, doc/Makefile.am, doc/doxyhtml/Makefile.am, doc/interpreter/Makefile.am, doc/interpreter/arith.txi, doc/interpreter/audio.txi, doc/interpreter/basics.txi, doc/interpreter/bugs.txi, doc/interpreter/container.txi, doc/interpreter/cp-idx.txi, doc/interpreter/data.txi, doc/interpreter/debug.txi, doc/interpreter/diagperm.txi, doc/interpreter/diffeq.txi, doc/interpreter/doccheck/README, doc/interpreter/doccheck/spellcheck, doc/interpreter/emacs.txi, doc/interpreter/errors.txi, doc/interpreter/eval.txi, doc/interpreter/expr.txi, doc/interpreter/external.txi, doc/interpreter/fn-idx.txi, doc/interpreter/func.txi, doc/interpreter/geometry.txi, doc/interpreter/geometryimages.m, doc/interpreter/gpl.txi, doc/interpreter/grammar.txi, doc/interpreter/gui.txi, doc/interpreter/image.txi, doc/interpreter/install.txi, doc/interpreter/interp.txi, doc/interpreter/interpimages.m, doc/interpreter/intro.txi, doc/interpreter/io.txi, doc/interpreter/java.txi, doc/interpreter/linalg.txi, doc/interpreter/macros.texi, doc/interpreter/matrix.txi, doc/interpreter/munge-texi.pl, doc/interpreter/nonlin.txi, doc/interpreter/numbers.txi, doc/interpreter/obsolete.txi, doc/interpreter/octave-config.1, doc/interpreter/octave.texi, doc/interpreter/oop.txi, doc/interpreter/op-idx.txi, doc/interpreter/optim.txi, doc/interpreter/package.txi, doc/interpreter/plot.txi, doc/interpreter/poly.txi, doc/interpreter/preface.txi, doc/interpreter/quad.txi, doc/interpreter/set.txi, doc/interpreter/signal.txi, doc/interpreter/sparse.txi, doc/interpreter/sparseimages.m, doc/interpreter/splineimages.m, doc/interpreter/stats.txi, doc/interpreter/stmt.txi, doc/interpreter/strings.txi, doc/interpreter/system.txi, doc/interpreter/testfun.txi, doc/interpreter/tips.txi, doc/interpreter/var.txi, doc/interpreter/vectorize.txi, doc/liboctave/Makefile.am, doc/liboctave/array.texi, doc/liboctave/bugs.texi, doc/liboctave/cp-idx.texi, doc/liboctave/dae.texi, doc/liboctave/diffeq.texi, doc/liboctave/error.texi, doc/liboctave/factor.texi, doc/liboctave/fn-idx.texi, doc/liboctave/gpl.texi, doc/liboctave/install.texi, doc/liboctave/intro.texi, doc/liboctave/liboctave.texi, doc/liboctave/matvec.texi, doc/liboctave/nleqn.texi, doc/liboctave/nlfunc.texi, doc/liboctave/ode.texi, doc/liboctave/optim.texi, doc/liboctave/preface.texi, doc/liboctave/quad.texi, doc/liboctave/range.texi, doc/refcard/Makefile.am, doc/refcard/refcard.tex, etc/HACKING, etc/NEWS.1, etc/NEWS.2, etc/NEWS.3, etc/OLD-ChangeLogs/ChangeLog, etc/OLD-ChangeLogs/doc-ChangeLog, etc/OLD-ChangeLogs/scripts-ChangeLog, etc/OLD-ChangeLogs/src-ChangeLog, etc/OLD-ChangeLogs/test-ChangeLog, etc/PROJECTS, etc/README.Cygwin, etc/README.MacOS, etc/README.MinGW, etc/README.gnuplot, etc/gdbinit, etc/icons/Makefile.am, examples/@polynomial/end.m, examples/@polynomial/subsasgn.m, examples/Makefile.am, examples/standalonebuiltin.cc, libgui/Makefile.am, libgui/qterminal/libqterminal/README, libgui/qterminal/libqterminal/unix/BlockArray.cpp, libgui/qterminal/libqterminal/unix/BlockArray.h, libgui/qterminal/libqterminal/unix/Character.h, libgui/qterminal/libqterminal/unix/CharacterColor.h, libgui/qterminal/libqterminal/unix/Emulation.cpp, libgui/qterminal/libqterminal/unix/Emulation.h, libgui/qterminal/libqterminal/unix/Filter.cpp, libgui/qterminal/libqterminal/unix/Filter.h, libgui/qterminal/libqterminal/unix/History.cpp, libgui/qterminal/libqterminal/unix/History.h, libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp, libgui/qterminal/libqterminal/unix/KeyboardTranslator.h, libgui/qterminal/libqterminal/unix/LineFont.h, libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp, libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h, libgui/qterminal/libqterminal/unix/Screen.cpp, libgui/qterminal/libqterminal/unix/Screen.h, libgui/qterminal/libqterminal/unix/ScreenWindow.cpp, libgui/qterminal/libqterminal/unix/ScreenWindow.h, libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp, libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.h, libgui/qterminal/libqterminal/unix/Vt102Emulation.h, libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp, libgui/qterminal/qterminal/main.cpp, libgui/src/m-editor/file-editor-tab.cc, libgui/src/octave-gui.cc, libgui/src/octave-qt-link.cc, libinterp/corefcn/data.cc, libinterp/corefcn/defun-int.h, libinterp/corefcn/det.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/oct-tex-parser.yy, libinterp/corefcn/oct-tex-symbols.in, libinterp/corefcn/quadcc.cc, libinterp/corefcn/zfstream.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/gendoc.pl, libinterp/genprops.awk, libinterp/mk-errno-list, libinterp/mk-pkg-add, libinterp/mkbuiltins, libinterp/mkdefs, libinterp/mkdocs, libinterp/mkops, libinterp/octave-value/ov-java.cc, libinterp/parse-tree/lex.ll, libinterp/parse-tree/oct-parse.in.yy, libinterp/parse-tree/octave.gperf, liboctave/Makefile.am, liboctave/array/Array.cc, liboctave/array/module.mk, liboctave/cruft/daspk/datv.f, liboctave/cruft/daspk/dcnst0.f, liboctave/cruft/daspk/dcnstr.f, liboctave/cruft/daspk/ddasic.f, liboctave/cruft/daspk/ddasid.f, liboctave/cruft/daspk/ddasik.f, liboctave/cruft/daspk/ddaspk.f, liboctave/cruft/daspk/ddstp.f, liboctave/cruft/daspk/ddwnrm.f, liboctave/cruft/daspk/dfnrmd.f, liboctave/cruft/daspk/dfnrmk.f, liboctave/cruft/daspk/dhels.f, liboctave/cruft/daspk/dheqr.f, liboctave/cruft/daspk/dinvwt.f, liboctave/cruft/daspk/dlinsd.f, liboctave/cruft/daspk/dlinsk.f, liboctave/cruft/daspk/dmatd.f, liboctave/cruft/daspk/dnedd.f, liboctave/cruft/daspk/dnedk.f, liboctave/cruft/daspk/dnsd.f, liboctave/cruft/daspk/dnsid.f, liboctave/cruft/daspk/dnsik.f, liboctave/cruft/daspk/dnsk.f, liboctave/cruft/daspk/dorth.f, liboctave/cruft/daspk/dslvd.f, liboctave/cruft/daspk/dslvk.f, liboctave/cruft/daspk/dspigm.f, liboctave/cruft/daspk/dyypnw.f, liboctave/cruft/dasrt/ddasrt.f, liboctave/cruft/dasrt/drchek.f, liboctave/cruft/dassl/ddaslv.f, liboctave/cruft/dassl/ddassl.f, liboctave/cruft/misc/blaswrap.c, liboctave/cruft/misc/module.mk, liboctave/cruft/odepack/cfode.f, liboctave/cruft/odepack/dlsode.f, liboctave/cruft/odepack/ewset.f, liboctave/cruft/odepack/intdy.f, liboctave/cruft/odepack/prepj.f, liboctave/cruft/odepack/sintdy.f, liboctave/cruft/odepack/slsode.f, liboctave/cruft/odepack/solsy.f, liboctave/cruft/odepack/ssolsy.f, liboctave/cruft/odepack/stode.f, liboctave/cruft/odepack/vnorm.f, liboctave/cruft/ranlib/Basegen.doc, liboctave/cruft/ranlib/README, liboctave/cruft/ranlib/genbet.f, liboctave/cruft/ranlib/genexp.f, liboctave/cruft/ranlib/gennch.f, liboctave/cruft/ranlib/gennf.f, liboctave/cruft/ranlib/gennor.f, liboctave/cruft/ranlib/getsd.f, liboctave/cruft/ranlib/initgn.f, liboctave/cruft/ranlib/phrtsd.f, liboctave/cruft/ranlib/randlib.fdoc, liboctave/cruft/ranlib/setsd.f, liboctave/cruft/ranlib/tstgmn.for, liboctave/cruft/ranlib/tstmid.for, liboctave/cruft/slatec-fn/atanh.f, liboctave/cruft/slatec-fn/datanh.f, liboctave/cruft/slatec-fn/xgmainc.f, liboctave/cruft/slatec-fn/xsgmainc.f, liboctave/numeric/module.mk, liboctave/operators/mk-ops.awk, liboctave/operators/mx-ops, liboctave/operators/sparse-mk-ops.awk, liboctave/operators/sparse-mx-ops, liboctave/operators/vx-ops, liboctave/util/module.mk, run-octave.in, scripts/@ftp/ftp.m, scripts/audio/wavread.m, scripts/deprecated/java_convert_matrix.m, scripts/deprecated/java_debug.m, scripts/deprecated/java_invoke.m, scripts/deprecated/java_new.m, scripts/deprecated/java_unsigned_conversion.m, scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m, scripts/deprecated/shell_cmd.m, scripts/general/accumarray.m, scripts/general/display.m, scripts/general/fieldnames.m, scripts/general/interp1.m, scripts/general/interp2.m, scripts/general/interp3.m, scripts/general/isa.m, scripts/general/methods.m, scripts/general/sortrows.m, scripts/geometry/convhull.m, scripts/geometry/delaunay.m, scripts/geometry/delaunay3.m, scripts/geometry/delaunayn.m, scripts/geometry/griddata.m, scripts/geometry/griddatan.m, scripts/geometry/voronoi.m, scripts/geometry/voronoin.m, scripts/gui/guihandles.m, scripts/gui/inputdlg.m, scripts/gui/listdlg.m, scripts/gui/msgbox.m, scripts/gui/questdlg.m, scripts/gui/uigetfile.m, scripts/gui/waitbar.m, scripts/gui/warndlg.m, scripts/help/doc.m, scripts/help/help.m, scripts/help/type.m, scripts/image/bone.m, scripts/image/cmpermute.m, scripts/image/cmunique.m, scripts/image/colorcube.m, scripts/image/colormap.m, scripts/image/contrast.m, scripts/image/gray2ind.m, scripts/image/image.m, scripts/image/imshow.m, scripts/image/ind2gray.m, scripts/image/jet.m, scripts/image/rgb2ntsc.m, scripts/image/spinmap.m, scripts/io/importdata.m, scripts/io/strread.m, scripts/io/textread.m, scripts/io/textscan.m, scripts/java/java_get.m, scripts/java/java_set.m, scripts/java/javaaddpath.m, scripts/java/javaclasspath.m, scripts/java/javamem.m, scripts/linear-algebra/linsolve.m, scripts/linear-algebra/qzhess.m, scripts/miscellaneous/debug.m, scripts/miscellaneous/desktop.m, scripts/miscellaneous/dir.m, scripts/miscellaneous/dos.m, scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m, scripts/miscellaneous/getappdata.m, scripts/miscellaneous/inputname.m, scripts/miscellaneous/license.m, scripts/miscellaneous/ls_command.m, scripts/miscellaneous/run.m, scripts/miscellaneous/setfield.m, scripts/miscellaneous/unix.m, scripts/miscellaneous/ver.m, scripts/mk-pkg-add, scripts/mkdoc.pl, scripts/optimization/fminsearch.m, scripts/optimization/optimset.m, scripts/optimization/sqp.m, scripts/pkg/pkg.m, scripts/pkg/private/create_pkgadddel.m, scripts/pkg/private/fix_depends.m, scripts/pkg/private/install.m, scripts/plot/appearance/axis.m, scripts/plot/appearance/box.m, scripts/plot/appearance/clabel.m, scripts/plot/appearance/daspect.m, scripts/plot/appearance/datetick.m, scripts/plot/appearance/grid.m, scripts/plot/appearance/legend.m, scripts/plot/appearance/orient.m, scripts/plot/appearance/shading.m, scripts/plot/appearance/text.m, scripts/plot/appearance/title.m, scripts/plot/appearance/xlabel.m, scripts/plot/appearance/ylabel.m, scripts/plot/appearance/zlabel.m, scripts/plot/draw/area.m, scripts/plot/draw/bar.m, scripts/plot/draw/barh.m, scripts/plot/draw/colorbar.m, scripts/plot/draw/contour.m, scripts/plot/draw/contour3.m, scripts/plot/draw/contourf.m, scripts/plot/draw/ellipsoid.m, scripts/plot/draw/errorbar.m, scripts/plot/draw/ezcontour.m, scripts/plot/draw/ezcontourf.m, scripts/plot/draw/ezmesh.m, scripts/plot/draw/ezpolar.m, scripts/plot/draw/fill.m, scripts/plot/draw/fplot.m, scripts/plot/draw/hist.m, scripts/plot/draw/meshc.m, scripts/plot/draw/meshz.m, scripts/plot/draw/pareto.m, scripts/plot/draw/patch.m, scripts/plot/draw/peaks.m, scripts/plot/draw/pie.m, scripts/plot/draw/pie3.m, scripts/plot/draw/plot.m, scripts/plot/draw/plotyy.m, scripts/plot/draw/private/__bar__.m, scripts/plot/draw/private/__contour__.m, scripts/plot/draw/private/__errplot__.m, scripts/plot/draw/private/__ezplot__.m, scripts/plot/draw/private/__patch__.m, scripts/plot/draw/private/__stem__.m, scripts/plot/draw/rectangle.m, scripts/plot/draw/ribbon.m, scripts/plot/draw/rose.m, scripts/plot/draw/scatter.m, scripts/plot/draw/scatter3.m, scripts/plot/draw/semilogx.m, scripts/plot/draw/shrinkfaces.m, scripts/plot/draw/sombrero.m, scripts/plot/draw/sphere.m, scripts/plot/draw/stairs.m, scripts/plot/draw/stem.m, scripts/plot/draw/stemleaf.m, scripts/plot/draw/surf.m, scripts/plot/draw/surface.m, scripts/plot/draw/surfc.m, scripts/plot/draw/surfl.m, scripts/plot/draw/surfnorm.m, scripts/plot/draw/tetramesh.m, scripts/plot/draw/trimesh.m, scripts/plot/draw/triplot.m, scripts/plot/draw/trisurf.m, scripts/plot/util/__gnuplot_drawnow__.m, scripts/plot/util/__plt_get_axis_arg__.m, scripts/plot/util/axes.m, scripts/plot/util/clf.m, scripts/plot/util/copyobj.m, scripts/plot/util/figure.m, scripts/plot/util/gcbo.m, scripts/plot/util/graphics_toolkit.m, scripts/plot/util/hggroup.m, scripts/plot/util/meshgrid.m, scripts/plot/util/newplot.m, scripts/plot/util/print.m, scripts/plot/util/private/__add_default_menu__.m, scripts/plot/util/private/__fltk_print__.m, scripts/plot/util/private/__gnuplot_print__.m, scripts/plot/util/private/__print_parse_opts__.m, scripts/plot/util/refreshdata.m, scripts/plot/util/subplot.m, scripts/polynomial/conv.m, scripts/polynomial/poly.m, scripts/polynomial/polyeig.m, scripts/polynomial/polyfit.m, scripts/polynomial/polyval.m, scripts/polynomial/private/__splinefit__.m, scripts/polynomial/spline.m, scripts/prefs/prefdir.m, scripts/prefs/preferences.m, scripts/prefs/private/prefsfile.m, scripts/prefs/rmpref.m, scripts/signal/freqz.m, scripts/signal/module.mk, scripts/sparse/eigs.m, scripts/sparse/pcg.m, scripts/sparse/private/__sprand_impl__.m, scripts/sparse/sprand.m, scripts/sparse/sprandn.m, scripts/sparse/spy.m, scripts/sparse/svds.m, scripts/specfun/expint.m, scripts/specfun/factor.m, scripts/special-matrix/gallery.m, scripts/special-matrix/hankel.m, scripts/special-matrix/toeplitz.m, scripts/startup/inputrc, scripts/statistics/base/kurtosis.m, scripts/statistics/base/moment.m, scripts/statistics/base/qqplot.m, scripts/statistics/base/var.m, scripts/statistics/distributions/betarnd.m, scripts/statistics/distributions/binoinv.m, scripts/statistics/distributions/binopdf.m, scripts/statistics/distributions/binornd.m, scripts/statistics/distributions/cauchy_rnd.m, scripts/statistics/distributions/chi2rnd.m, scripts/statistics/distributions/discrete_pdf.m, scripts/statistics/distributions/discrete_rnd.m, scripts/statistics/distributions/empirical_rnd.m, scripts/statistics/distributions/exprnd.m, scripts/statistics/distributions/frnd.m, scripts/statistics/distributions/gamrnd.m, scripts/statistics/distributions/geornd.m, scripts/statistics/distributions/hygernd.m, scripts/statistics/distributions/kolmogorov_smirnov_cdf.m, scripts/statistics/distributions/laplace_cdf.m, scripts/statistics/distributions/laplace_pdf.m, scripts/statistics/distributions/logistic_cdf.m, scripts/statistics/distributions/logistic_pdf.m, scripts/statistics/distributions/lognrnd.m, scripts/statistics/distributions/nbincdf.m, scripts/statistics/distributions/nbininv.m, scripts/statistics/distributions/nbinpdf.m, scripts/statistics/distributions/nbinrnd.m, scripts/statistics/distributions/normrnd.m, scripts/statistics/distributions/poissinv.m, scripts/statistics/distributions/poissrnd.m, scripts/statistics/distributions/tinv.m, scripts/statistics/distributions/trnd.m, scripts/statistics/distributions/unidcdf.m, scripts/statistics/distributions/unidpdf.m, scripts/statistics/distributions/unidrnd.m, scripts/statistics/distributions/unifrnd.m, scripts/statistics/distributions/wblrnd.m, scripts/statistics/models/module.mk, scripts/statistics/tests/kruskal_wallis_test.m, scripts/strings/base2dec.m, scripts/strings/deblank.m, scripts/strings/dec2base.m, scripts/strings/dec2bin.m, scripts/strings/dec2hex.m, scripts/strings/mat2str.m, scripts/strings/ostrsplit.m, scripts/strings/regexptranslate.m, scripts/strings/str2num.m, scripts/strings/strcat.m, scripts/strings/strjoin.m, scripts/strings/strsplit.m, scripts/strings/strtok.m, scripts/strings/strtrim.m, scripts/strings/strtrunc.m, scripts/strings/substr.m, scripts/testfun/__run_test_suite__.m, scripts/testfun/speed.m, scripts/testfun/test.m, scripts/time/asctime.m, scripts/time/datenum.m, scripts/time/datevec.m, scripts/time/weekday.m, src/Makefile.am, test/Makefile.am, test/build-bc-overload-tests.sh, test/build-sparse-tests.sh, test/jit.tst, test/line-continue.tst: Strip trailing whitespace.

author	John W. Eaton <jwe@octave.org>
date	Tue, 20 Jan 2015 08:26:57 -0500
parents	2ce1f1966fc3
children	0e1f5a750d00

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

Mercurial > octave-nkf

annotate scripts/io/textscan.m @ 19627:446c46af4b42 stable