Mercurial > octave-nkf

comparison scripts/io/textscan.m @ 19630:0e1f5a750d00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 10:24:46 -0500
parents 6ca096827123 446c46af4b42
children 9fc020886ae9
comparison
equal deleted inserted replaced
19626:37d37297acf8 19630:0e1f5a750d00
205 args(headerlines:headerlines+1) = []; 205 args(headerlines:headerlines+1) = [];
206 st_pos = ftell (fid); 206 st_pos = ftell (fid);
207 elseif (args{headerlines + 1} < 0) 207 elseif (args{headerlines + 1} < 0)
208 warning ("textscan.m: negative headerline value ignored"); 208 warning ("textscan.m: negative headerline value ignored");
209 endif 209 endif
210 endif 210 endif
211 ## Read a first file chunk. Rest follows after endofline processing 211 ## Read a first file chunk. Rest follows after endofline processing
212 [str, count] = fscanf (fid, "%c", BUFLENGTH); 212 [str, count] = fscanf (fid, "%c", BUFLENGTH);
213 213
214 endif 214 endif
215 215
336 ## Distribute columns over C and wipe cols 2:end of C{1} 336 ## Distribute columns over C and wipe cols 2:end of C{1}
337 for ii=2:ncols 337 for ii=2:ncols
338 C(ii) = C{1}(:, ii); 338 C(ii) = C{1}(:, ii);
339 endfor 339 endfor
340 C{1} = C{1}(:, 1); 340 C{1} = C{1}(:, 1);
341 endif 341 endif
342 endif 342 endif
343 343
344 ## If requested, collect output columns of same class 344 ## If requested, collect output columns of same class
345 if (collop) 345 if (collop)
346 C = colloutp (C); 346 C = colloutp (C);