Mercurial > octave
diff libinterp/corefcn/file-io.cc @ 21581:6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
* testfun.txi: Document Octave conventions for use of semicolon in BIST tests.
* cellfun.cc, ellipj.cc, file-io.cc, gcd.cc, hash.cc, nproc.cc,
utils.cc, fftw.cc, ov-usr-fcn.cc, oct-parse.in.yy, md5sum.m, wavread.m, wavwrite.m,
cplxpair.m, rat.m, im2double.m, rref.m, stem3.m, rotate.m, pchip.m, blackman.m,
hamming.m, hanning.m, spectral_adf.m, spectral_xdf.m, assert.m, fail.m,
etime.m, build-sparse-tests.sh, classes.tst, ctor-vs-method.tst, index.tst,
io.tst, struct.tst: Follow Octave conventions for use of semicolon in BIST
tests.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 01 Apr 2016 18:16:01 -0700 |
| parents | ecce63c99c3f |
| children | fe0a6de805e4 |
line wrap: on
line diff
--- a/libinterp/corefcn/file-io.cc Fri Apr 01 16:03:29 2016 -0700 +++ b/libinterp/corefcn/file-io.cc Fri Apr 01 18:16:01 2016 -0700 @@ -1718,7 +1718,7 @@ %! assert (c, {[1;4], 2, 3}); %! assert (u, {[1;4], 2, 3}); -%!error <Read error in field 2 of row 2> textscan ("1 2 3\n4 s 6", "%f %f %f", "ReturnOnError", 0); +%!error <Read error in field 2 of row 2> textscan ("1 2 3\n4 s 6", "%f %f %f", "ReturnOnError", 0) %!test %! ## Check ReturnOnError @@ -1757,8 +1757,8 @@ %!error <must be a string> textscan ("Hello World", 2) #%!error <cannot provide position information> [C, pos] = textscan ("Hello World") %!error <at most one character or> textscan ("Hello World", '%s', 'EndOfLine', 3) -%!error <'%z' is not a valid format specifier> textscan ("1.0", "%z"); -%!error <no valid format conversion specifiers> textscan ("1.0", "foo"); +%!error <'%z' is not a valid format specifier> textscan ("1.0", "%z") +%!error <no valid format conversion specifiers> textscan ("1.0", "foo") ## Test incomplete first data line %! R = textscan (['Empty1' char(10)], 'Empty%d %f');