Mercurial > octave-nkf

comparison libinterp/octave-value/ov-class.cc @ 20482:c6224b4e7774

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Octave's default save format is '-text' which is confusingly referred to in the code base as LS_ASCII (looks like '-ascii' mode). * ls-oct-text.cc, ls-oct-text.h: Renamed from ls-oct-ascii.[cc|h]. * ls-oct-ascii.cc, ls-oct-ascii.h: Removed files. * libinterp/corefcn/module.mk: Add ls-oct-text.cc, ls-oct-text.h to build system. * load-save.h (load_save_format_type): Change first value of enum from LS_ASCII to LS_TEXT. * load-save.cc: Rename instances of LS_ASCII to LS_TEXT. Rename instances of read_ascii_data to read_text_data. * ov-base-diag.cc, ov-base-int.cc, ov-base-sparse.cc, ov-bool-mat.cc, ov-bool.cc, ov-complex.cc, ov-cx-mat.cc ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-perm.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Use '#include "ls-oct-text.h"' rather than ls-oct-ascii.h. ov-cell.cc, ov-class.cc, ov-fcn-handle.cc, ov-lazy-idx.cc, ov-struct.cc: Use '#include "ls-oct-text.h"' rather than ls-oct-ascii.h. Rename save_ascii_data to save_text_data, read_ascii_data to read_text_data.
author Rik <rik@octave.org>
date Mon, 17 Aug 2015 09:20:03 -0700
parents a9574e3c6e9e
children bf6c4433ed5f
comparison
equal deleted inserted replaced
20479:ab2c5e84954a 20482:c6224b4e7774
37 #include "error.h" 37 #include "error.h"
38 #include "file-ops.h" 38 #include "file-ops.h"
39 #include "gripes.h" 39 #include "gripes.h"
40 #include "load-path.h" 40 #include "load-path.h"
41 #include "ls-hdf5.h" 41 #include "ls-hdf5.h"
42 #include "ls-oct-ascii.h" 42 #include "ls-oct-text.h"
43 #include "ls-oct-binary.h" 43 #include "ls-oct-binary.h"
44 #include "ls-utils.h" 44 #include "ls-utils.h"
45 #include "mxarray.h" 45 #include "mxarray.h"
46 #include "oct-lvalue.h" 46 #include "oct-lvalue.h"
47 #include "oct-hdf5.h" 47 #include "oct-hdf5.h"
1275 octave_map::iterator i = m.begin (); 1275 octave_map::iterator i = m.begin ();
1276 while (i != m.end ()) 1276 while (i != m.end ())
1277 { 1277 {
1278 octave_value val = map.contents (i); 1278 octave_value val = map.contents (i);
1279 1279
1280 bool b = save_ascii_data (os, val, m.key (i), false, 0); 1280 bool b = save_text_data (os, val, m.key (i), false, 0);
1281 1281
1282 if (! b) 1282 if (! b)
1283 return ! os.fail (); 1283 return ! os.fail ();
1284 1284
1285 i++; 1285 i++;
1308 octave_value t2; 1308 octave_value t2;
1309 bool dummy; 1309 bool dummy;
1310 1310
1311 // recurse to read cell elements 1311 // recurse to read cell elements
1312 std::string nm 1312 std::string nm
1313 = read_ascii_data (is, std::string (), dummy, t2, j); 1313 = read_text_data (is, std::string (), dummy, t2, j);
1314 1314
1315 if (! is) 1315 if (! is)
1316 break; 1316 break;
1317 1317
1318 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); 1318 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);