Mercurial > octave-nkf

annotate scripts/strings/strtok.m @ 19627:446c46af4b42 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d63878346099
children 4197fc428c7d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17744
d63878346099 maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents: 16994
diff changeset
1 ## Copyright (C) 2000-2013 Paul Kienzle
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
2 ##
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
3 ## This file is part of Octave.
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
4 ##
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5827
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5827
diff changeset
8 ## your option) any later version.
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
9 ##
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
13 ## General Public License for more details.
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
14 ##
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5827
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5827
diff changeset
17 ## <http://www.gnu.org/licenses/>.
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
18
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
19 ## -*- texinfo -*-
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
20 ## @deftypefn {Function File} {[@var{tok}, @var{rem}] =} strtok (@var{str})
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
21 ## @deftypefnx {Function File} {[@var{tok}, @var{rem}] =} strtok (@var{str}, @var{delim})
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
22 ##
19627
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
23 ## Find all characters in the string @var{str} up to, but not including, the
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
24 ## first character which is in the string @var{delim}. If @var{rem} is
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
25 ## requested, it contains the remainder of the string, starting at the first
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
26 ## delimiter. Leading delimiters are ignored. If @var{delim} is not
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
27 ## specified, whitespace is assumed. @var{str} may also be a cell array of
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
28 ## strings in which case the function executes on every individual string
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
29 ## and returns a cell array of tokens and remainders.
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
30 ##
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
31 ## Examples:
8442
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
32 ##
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
33 ## @example
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
34 ## @group
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
35 ## strtok ("this is the life")
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
36 ## @result{} "this"
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
37 ##
8442
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
38 ## [tok, rem] = strtok ("14*27+31", "+-*/")
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
39 ## @result{}
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
40 ## tok = 14
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
41 ## rem = *27+31
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
42 ## @end group
502e58a0d44f Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 8202
diff changeset
43 ## @end example
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
44 ## @seealso{index, strsplit, strchr, isspace}
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
45 ## @end deftypefn
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
46
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
47 function [tok, rem] = strtok (str, delim)
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
48
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
49 if (nargin < 1 || nargin > 2)
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
50 print_usage ();
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
51 elseif (! (ischar (str) || iscellstr (str)))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
52 error ("strtok: STR must be a string or cell array of strings.");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
53 elseif (ischar (str) && ! isvector (str) &&! isempty (str))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
54 error ("strtok: STR cannot be a 2-D character array.");
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
55 endif
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
56
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
57 if (nargin < 2 || isempty (delim))
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
58 ws_delim = true;
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
59 else
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
60 ws_delim = false;
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
61 endif
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
62
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
63 if (isempty (str))
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
64 tok = rem = "";
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
65 elseif (ischar (str))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
66 if (ws_delim)
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
67 idx = isspace (str);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
68 elseif (length (delim) <= 7)
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
69 ## Build index of delimiters incrementally for low N.
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
70 idx = str == delim(1);
19627
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
71 for i = 2:length (delim)
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
72 idx |= str == delim(i);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
73 endfor
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
74 else
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
75 ## Index the str into a mask of valid values. Faster for large N.
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
76 f = false (256, 1);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
77 ## This is slower than it could be because of the +1 issue.
14868
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14363
diff changeset
78 f(uint8 (delim)+1) = true;
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
79 ## Default goes via double -- unnecessarily long.
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
80 si = uint32 (str);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
81 ## in-place is faster than str+1
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
82 ++si;
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
83 idx = f(si);
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
84 endif
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
85
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
86 idx_dlim = find (idx, 1);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
87 idx_nodlim = find (! idx, 1);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
88 if (isempty (idx_dlim))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
89 ## No delimiter. Return whole string.
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
90 tok = str;
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
91 rem = "";
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
92 elseif (idx_dlim > idx_nodlim)
19627
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
93 ## Normal case. No leading delimiters and at least 1 delimiter in STR.
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
94 tok = str(1:idx_dlim-1);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
95 rem = str(idx_dlim:end);
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
96 else
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
97 ## Leading delimiter found.
19627
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
98 idx_dlim = find (idx(idx_nodlim+1:end), 1);
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
99 if (isempty (idx_dlim))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
100 ## No further delimiters. Return STR stripped of delimiter prefix.
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
101 tok = str(idx_nodlim:end);
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 9036
diff changeset
102 rem = "";
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
103 else
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
104 ## Strip delimiter prefix. Return STR up to 1st delimiter
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
105 tok = str(idx_nodlim:(idx_dlim + idx_nodlim -1));
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
106 rem = str((idx_dlim + idx_nodlim):end);
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
107 endif
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
108 endif
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
109 else # Cell array of strings
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
110 if (ws_delim)
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
111 delim = '\s';
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
112 endif
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
113 ptn = [ '^[' delim ']*','([^' delim ']+)','([' delim '].*)$' ];
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
114 matches = regexp (str, ptn, "tokens");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
115 eidx = cellfun ("isempty", matches);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
116 midx = ! eidx;
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
117 tok = cell (size (str));
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
118 tok(eidx) = regexprep (str(eidx), [ '^[' delim ']+' ], '');
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
119 ## Unwrap doubly nested cell array from regexp
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
120 tmp = [matches{midx}];
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
121 if (! isempty (tmp))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
122 tmp = [tmp{:}];
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
123 endif
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
124 tok(midx) = tmp(1:2:end);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
125 if (isargout (2))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
126 rem = cell (size (str));
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
127 rem(eidx) = {""};
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
128 rem(midx) = tmp(2:2:end);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
129 endif
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
130 endif
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
131
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
132 endfunction
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
133
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
134
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
135 %!demo
14237
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
136 %! strtok ("this is the life")
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
137 %! % split at the first space, returning "this"
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
138
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
139 %!demo
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
140 %! s = "14*27+31"
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
141 %! while (1)
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
142 %! [t, s] = strtok (s, "+-*/");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
143 %! printf ("<%s>", t);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
144 %! if (isempty (s))
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
145 %! break;
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
146 %! endif
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
147 %! printf ("<%s>", s(1));
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
148 %! endwhile
14868
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14363
diff changeset
149 %! printf ("\n");
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
150 %! % ----------------------------------------------------
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
151 %! % Demonstrates processing of an entire string split on
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
152 %! % a variety of delimiters. Tokens and delimiters are
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
153 %! % printed one after another in angle brackets.
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
154
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
155 %% Test the tokens for all cases
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
156 %!assert (strtok (""), ""); # no string
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
157 %!assert (strtok ("this"), "this"); # no delimiter in string
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
158 %!assert (strtok ("this "), "this"); # delimiter at end
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
159 %!assert (strtok ("this is"), "this"); # delimiter in middle
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
160 %!assert (strtok (" this"), "this"); # delimiter at start
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
161 %!assert (strtok (" this "), "this"); # delimiter at start and end
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
162 %!assert (strtok (" "), ""(1:0)); # delimiter only
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
163
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
164 %% Test the remainder for all cases
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
165 %!test [t,r] = strtok (""); assert (r, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
166 %!test [t,r] = strtok ("this"); assert (r, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
167 %!test [t,r] = strtok ("this "); assert (r, " ");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
168 %!test [t,r] = strtok ("this is"); assert (r, " is");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
169 %!test [t,r] = strtok (" this"); assert (r, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
170 %!test [t,r] = strtok (" this "); assert (r, " ");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
171 %!test [t,r] = strtok (" "); assert (r, "");
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
172
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
173 %% Test all tokens and remainders with cell array input
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
174 %!test
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
175 %! str = {"", "this", "this ", "this is", " this", " this ", " "};
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
176 %! [t, r] = strtok (str);
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
177 %! assert (t{1}, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
178 %! assert (r{1}, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
179 %! assert (t{2}, "this");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
180 %! assert (r{2}, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
181 %! assert (t{3}, "this");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
182 %! assert (r{3}, " ");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
183 %! assert (t{4}, "this");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
184 %! assert (r{4}, " is");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
185 %! assert (t{5}, "this");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
186 %! assert (r{5}, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
187 %! assert (t{6}, "this");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
188 %! assert (r{6}, " ");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
189 %! assert (t{7}, "");
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
190 %! assert (r{7}, "");
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
191
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
192 %% Simple check for 2, 3, and 4 delimeters
14363
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
193 %!assert (strtok ("this is", "i "), "th")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
194 %!assert (strtok ("this is", "ij "), "th")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
195 %!assert (strtok ("this is", "ijk "), "th")
5827
1fe78adb91bc [project @ 2006-05-22 06:25:14 by jwe]
jwe
parents:
diff changeset
196
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
197 %% Test all cases for 8 delimiters since a different
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
198 %!# algorithm is used when more than 7 delimiters
14363
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
199 %!assert (strtok ("","jklmnop "), "")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
200 %!assert (strtok ("this","jklmnop "), "this")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
201 %!assert (strtok ("this ","jklmnop "), "this")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
202 %!assert (strtok ("this is","jklmnop "), "this")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
203 %!assert (strtok (" this","jklmnop "), "this")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
204 %!assert (strtok (" this ","jklmnop "), "this")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
205 %!assert (strtok (" ","jklmnop "), ""(1:0))
8002
30f560a5fbc3 strtok.m: include TAB, LF, VT, FF, and CR in default set of delim characters
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
206
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
207 %% Test 'bad' string orientations
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
208 %!assert (strtok (" this ".'), "this".'); # delimiter at start and end
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
209 %!assert (strtok (" this ".',"jkl "), "this".');
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
210
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
211 %% Test with TAB, LF, VT, FF, and CR
8002
30f560a5fbc3 strtok.m: include TAB, LF, VT, FF, and CR in default set of delim characters
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
212 %!test
30f560a5fbc3 strtok.m: include TAB, LF, VT, FF, and CR in default set of delim characters
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
213 %! for ch = "\t\n\v\f\r"
16994
333243133364 Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents: 14868
diff changeset
214 %! [t, r] = strtok (["beg", ch, "end"]);
8002
30f560a5fbc3 strtok.m: include TAB, LF, VT, FF, and CR in default set of delim characters
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
215 %! assert (t, "beg");
16994
333243133364 Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents: 14868
diff changeset
216 %! assert (r, [ch, "end"]);
8002
30f560a5fbc3 strtok.m: include TAB, LF, VT, FF, and CR in default set of delim characters
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
217 %! endfor
13790
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
218
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
219 %% Test input validation
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
220 %!error strtok ()
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
221 %!error strtok ("a", "b", "c")
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
222 %!error <STR must be a string> strtok (1, "b")
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
223 %!error <STR cannot be a 2-D> strtok (char ("hello", "world"), "l")
fa94d6a93d45 strtok.m: Revamp code for performance. Add cellstr input functionality.
Rik <octave@nomad.inbox5.com>
parents: 11587
diff changeset
224