Mercurial > hg > octave-nkf
diff libinterp/octave-value/ov-struct.cc @ 20657:c6224b4e7774
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 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-struct.cc +++ b/libinterp/octave-value/ov-struct.cc @@ -42,7 +42,7 @@ #include "oct-locbuf.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-oct-binary.h" #include "ls-hdf5.h" #include "ls-utils.h" @@ -766,7 +766,7 @@ octave_value val = map.contents (key); - bool b = save_ascii_data (os, val, key, false, 0); + bool b = save_text_data (os, val, key, false, 0); if (! b) return ! os.fail (); @@ -820,7 +820,7 @@ // recurse to read cell elements std::string nm - = read_ascii_data (is, std::string (), dummy, t2, j); + = read_text_data (is, std::string (), dummy, t2, j); if (!is) break; @@ -1476,7 +1476,7 @@ octave_value val = map.contents (key); - bool b = save_ascii_data (os, val, key, false, 0); + bool b = save_text_data (os, val, key, false, 0); if (! b) return ! os.fail (); @@ -1504,7 +1504,7 @@ // recurse to read cell elements std::string nm - = read_ascii_data (is, std::string (), dummy, t2, j); + = read_text_data (is, std::string (), dummy, t2, j); if (!is) break;