Mercurial > hg > octave-nkf

comparison libinterp/octave-value/ov-struct.cc @ 20657: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 c41595061186
comparison
equal deleted inserted replaced
20654:ab2c5e84954a 20657:c6224b4e7774
40 40
41 #include "Array-util.h" 41 #include "Array-util.h"
42 #include "oct-locbuf.h" 42 #include "oct-locbuf.h"
43 43
44 #include "byte-swap.h" 44 #include "byte-swap.h"
45 #include "ls-oct-ascii.h" 45 #include "ls-oct-text.h"
46 #include "ls-oct-binary.h" 46 #include "ls-oct-binary.h"
47 #include "ls-hdf5.h" 47 #include "ls-hdf5.h"
48 #include "ls-utils.h" 48 #include "ls-utils.h"
49 #include "pr-output.h" 49 #include "pr-output.h"
50 50
764 { 764 {
765 std::string key = keys(i); 765 std::string key = keys(i);
766 766
767 octave_value val = map.contents (key); 767 octave_value val = map.contents (key);
768 768
769 bool b = save_ascii_data (os, val, key, false, 0); 769 bool b = save_text_data (os, val, key, false, 0);
770 770
771 if (! b) 771 if (! b)
772 return ! os.fail (); 772 return ! os.fail ();
773 } 773 }
774 774
818 octave_value t2; 818 octave_value t2;
819 bool dummy; 819 bool dummy;
820 820
821 // recurse to read cell elements 821 // recurse to read cell elements
822 std::string nm 822 std::string nm
823 = read_ascii_data (is, std::string (), dummy, t2, j); 823 = read_text_data (is, std::string (), dummy, t2, j);
824 824
825 if (!is) 825 if (!is)
826 break; 826 break;
827 827
828 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); 828 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
1474 { 1474 {
1475 std::string key = keys(i); 1475 std::string key = keys(i);
1476 1476
1477 octave_value val = map.contents (key); 1477 octave_value val = map.contents (key);
1478 1478
1479 bool b = save_ascii_data (os, val, key, false, 0); 1479 bool b = save_text_data (os, val, key, false, 0);
1480 1480
1481 if (! b) 1481 if (! b)
1482 return ! os.fail (); 1482 return ! os.fail ();
1483 } 1483 }
1484 1484
1502 octave_value t2; 1502 octave_value t2;
1503 bool dummy; 1503 bool dummy;
1504 1504
1505 // recurse to read cell elements 1505 // recurse to read cell elements
1506 std::string nm 1506 std::string nm
1507 = read_ascii_data (is, std::string (), dummy, t2, j); 1507 = read_text_data (is, std::string (), dummy, t2, j);
1508 1508
1509 if (!is) 1509 if (!is)
1510 break; 1510 break;
1511 1511
1512 if (error_state) 1512 if (error_state)