Mercurial > hg > octave-max

comparison src/ls-oct-ascii.cc @ 15467:d174210ce1ec stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use ' instead of ` in error messages, warnings and most comments * intro.txi, io.txi, munge-texi.cc, octave.texi, cmd-edit.cc, data-conv.cc, file-ops.cc, glob-match.h, kpse.cc, oct-env.cc, oct-locbuf.h, oct-md5.cc, oct-rand.cc, general/interp2.m, doc.m, get_first_help_sentence.m, help.m, print_usage.m, __additional_help_message__.m, type.m, unimplemented.m, which.m, cast.m, dir.m, license.m, mkoctfile.m, recycle.m, tempdir.m, optimset.m, pkg/pkg.m, closereq.m, colstyle.m, __fltk_print__.m, __gnuplot_print__.m, __go_draw_figure__.m, __pie__.m, __pltopt__.m, __print_parse_opts__.m, uigetdir.m, uigetfile.m, uiputfile.m, stft.m, mean.m, anova.m, cor_test.m, t_test_regression.m, __magick_read__.cc, dlmread.cc, schur.cc, data.cc, debug.cc, defun-dld.h, defun.cc, defun.h, dynamic-ld.cc, error.cc, error.h, gl-render.cc, graphics.cc, gripes.cc, input.cc, lex.ll, load-path.cc, load-save.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-ascii.cc, ls-oct-binary.cc, oct-hist.cc, oct-parse.yy, oct-stream.cc, oct-stream.h, octave.cc, ov-base-diag.cc, ov-base.cc, ov-class.cc, ov-colon.h, ov-struct.cc, ov-typeinfo.cc, ov.cc, pager.cc, pr-output.cc, pt-binop.cc, pt-eval.cc, pt-id.cc, pt-idx.cc, pt-misc.cc, pt-unop.cc, symtab.cc, symtab.h, toplev.cc, txt-eng-ft.cc, utils.cc, variables.cc, test_eval-catch.m, test_try.m: Use ' instead of ` in error messages, warnings, and most comments.
author John W. Eaton <jwe@octave.org>
date Mon, 01 Oct 2012 17:18:49 -0400
parents 72c96de7a403
children
comparison
equal deleted inserted replaced
15438:c9954a15bc03 15467:d174210ce1ec
153 // 153 //
154 // The data is expected to be in the following format: 154 // The data is expected to be in the following format:
155 // 155 //
156 // The input file must have a header followed by some data. 156 // The input file must have a header followed by some data.
157 // 157 //
158 // All lines in the header must begin with a `#' character. 158 // All lines in the header must begin with a '#' character.
159 // 159 //
160 // The header must contain a list of keyword and value pairs with the 160 // The header must contain a list of keyword and value pairs with the
161 // keyword and value separated by a colon. 161 // keyword and value separated by a colon.
162 // 162 //
163 // Keywords must appear in the following order: 163 // Keywords must appear in the following order:
242 std::string name = extract_keyword (is, "name"); 242 std::string name = extract_keyword (is, "name");
243 243
244 if (name.empty ()) 244 if (name.empty ())
245 { 245 {
246 if (count == 0) 246 if (count == 0)
247 error ("load: empty name keyword or no data found in file `%s'", 247 error ("load: empty name keyword or no data found in file '%s'",
248 filename.c_str ()); 248 filename.c_str ());
249 249
250 return std::string (); 250 return std::string ();
251 } 251 }
252 252
253 if (! (name == ".nargin." || name == ".nargout." 253 if (! (name == ".nargin." || name == ".nargout."
254 || name == CELL_ELT_TAG || valid_identifier (name))) 254 || name == CELL_ELT_TAG || valid_identifier (name)))
255 { 255 {
256 error ("load: bogus identifier `%s' found in file `%s'", 256 error ("load: bogus identifier '%s' found in file '%s'",
257 name.c_str (), filename.c_str ()); 257 name.c_str (), filename.c_str ());
258 return std::string (); 258 return std::string ();
259 } 259 }
260 260
261 // Look for type keyword. 261 // Look for type keyword.
281 tc = charMatrix (); 281 tc = charMatrix ();
282 else 282 else
283 tc = octave_value_typeinfo::lookup_type (typ); 283 tc = octave_value_typeinfo::lookup_type (typ);
284 284
285 if (! tc.load_ascii (is)) 285 if (! tc.load_ascii (is))
286 error ("load: trouble reading ascii file `%s'", filename.c_str ()); 286 error ("load: trouble reading ascii file '%s'", filename.c_str ());
287 } 287 }
288 else 288 else
289 error ("load: failed to extract keyword specifying value type"); 289 error ("load: failed to extract keyword specifying value type");
290 290
291 if (error_state) 291 if (error_state)