Mercurial > octave-nkf

comparison liboctave/system/file-ops.cc @ 20267:a9574e3c6e9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate Array::length() and Sparse::length() in favour of ::numel(). * liboctave/array/Array.h (Array::length): deprecate for ::numel. * liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel. * libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc, libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc, libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc, libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc, liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h, liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc, liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc, liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc, liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc, liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc, liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc, liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h, liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc, liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc, liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc, liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc, liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc, liboctave/util/glob-match.h, liboctave/util/kpse.cc, liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc, liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc, liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage of Array::length() and Sparse::length() with ::numel().
author Carnë Draug <carandraug@octave.org>
date Sat, 30 May 2015 03:14:07 +0100
parents 4197fc428c7d
children 3aea4200da40
comparison
equal deleted inserted replaced
20266:83792dd9bcc1 20267:a9574e3c6e9e
150 150
151 if (! prefixes.empty ()) 151 if (! prefixes.empty ())
152 { 152 {
153 for (size_t i = 0; i < s_len; i++) 153 for (size_t i = 0; i < s_len; i++)
154 { 154 {
155 for (int j = 0; j < prefixes.length (); j++) 155 for (int j = 0; j < prefixes.numel (); j++)
156 { 156 {
157 size_t pfx_len = prefixes[j].length (); 157 size_t pfx_len = prefixes[j].length ();
158 158
159 if (prefixes[j].compare (s.substr (i, pfx_len)) == 0) 159 if (prefixes[j].compare (s.substr (i, pfx_len)) == 0)
160 { 160 {
185 if (file_ops::is_dir_sep (s[i])) 185 if (file_ops::is_dir_sep (s[i]))
186 break; 186 break;
187 187
188 if (! suffixes.empty ()) 188 if (! suffixes.empty ())
189 { 189 {
190 for (int j = 0; j < suffixes.length (); j++) 190 for (int j = 0; j < suffixes.numel (); j++)
191 { 191 {
192 size_t sfx_len = suffixes[j].length (); 192 size_t sfx_len = suffixes[j].length ();
193 193
194 if (suffixes[j].compare (s.substr (i, sfx_len)) == 0) 194 if (suffixes[j].compare (s.substr (i, sfx_len)) == 0)
195 return i; 195 return i;
344 string_vector 344 string_vector
345 file_ops::tilde_expand (const string_vector& names) 345 file_ops::tilde_expand (const string_vector& names)
346 { 346 {
347 string_vector retval; 347 string_vector retval;
348 348
349 int n = names.length (); 349 int n = names.numel ();
350 350
351 retval.resize (n); 351 retval.resize (n);
352 352
353 for (int i = 0; i < n; i++) 353 for (int i = 0; i < n; i++)
354 retval[i] = tilde_expand (names[i]); 354 retval[i] = tilde_expand (names[i]);
578 578
579 if (dir) 579 if (dir)
580 { 580 {
581 string_vector dirlist = dir.read (); 581 string_vector dirlist = dir.read ();
582 582
583 for (octave_idx_type i = 0; i < dirlist.length (); i++) 583 for (octave_idx_type i = 0; i < dirlist.numel (); i++)
584 { 584 {
585 octave_quit (); 585 octave_quit ();
586 586
587 std::string nm = dirlist[i]; 587 std::string nm = dirlist[i];
588 588