Mercurial > hg > octave-nkf
changeset 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.
line wrap: on
line diff
--- a/libinterp/corefcn/load-save.cc +++ b/libinterp/corefcn/load-save.cc @@ -77,7 +77,7 @@ #include "ls-mat-ascii.h" #include "ls-mat4.h" #include "ls-mat5.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-oct-binary.h" // Remove gnulib definitions, if any. @@ -270,7 +270,7 @@ std::string type_val = extract_keyword (file, "type"); if (name_val.empty () != true && type_val.empty () != true) - retval = LS_ASCII; + retval = LS_TEXT; else { file.clear (); @@ -363,8 +363,8 @@ switch (format.type) { - case LS_ASCII: - name = read_ascii_data (stream, orig_fname, global, tc, count); + case LS_TEXT: + name = read_text_data (stream, orig_fname, global, tc, count); break; case LS_BINARY: @@ -709,7 +709,7 @@ } else if (argv[i] == "-text" || argv[i] == "-t") { - format = LS_ASCII; + format = LS_TEXT; } else break; @@ -928,8 +928,8 @@ { switch (fmt.type) { - case LS_ASCII: - save_ascii_data (os, tc, name, global, 0); + case LS_TEXT: + save_text_data (os, tc, name, global, 0); break; case LS_BINARY: @@ -1070,7 +1070,7 @@ } else if (argv[i] == "-text" || argv[i] == "-t") { - format = LS_ASCII; + format = LS_TEXT; } else if (argv[i] == "-binary" || argv[i] == "-b") { @@ -1229,7 +1229,7 @@ #ifdef HAVE_HDF5 case LS_HDF5: #endif /* HAVE_HDF5 */ - case LS_ASCII: + case LS_TEXT: { octave_localtime now; @@ -1615,7 +1615,7 @@ bool save_as_floats = false; - load_save_format format = LS_ASCII; + load_save_format format = LS_TEXT; bool append = false; @@ -1640,7 +1640,7 @@ return retval; } - if (save_as_floats && format == LS_ASCII) + if (save_as_floats && format == LS_TEXT) { error ("save: cannot specify both -ascii and -float-binary"); return retval;
--- a/libinterp/corefcn/load-save.h +++ b/libinterp/corefcn/load-save.h @@ -35,7 +35,7 @@ // Similarly, save_as_floats may be an option for LS_BINARY, LS_HDF5 etc. enum load_save_format_type { - LS_ASCII, + LS_TEXT, LS_BINARY, LS_MAT_ASCII, LS_MAT_BINARY,
rename from libinterp/corefcn/ls-oct-ascii.cc rename to libinterp/corefcn/ls-oct-text.cc --- a/libinterp/corefcn/ls-oct-ascii.cc +++ b/libinterp/corefcn/ls-oct-text.cc @@ -52,7 +52,7 @@ #include "gripes.h" #include "load-save.h" #include "ls-ascii-helper.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "oct-obj.h" #include "oct-map.h" #include "ov-cell.h" @@ -67,7 +67,7 @@ // The number of decimal digits to use when writing ascii data. static int Vsave_precision = 16; -// Functions for reading ascii data. +// Functions for reading octave format text data. // Extract a KEYWORD and its value from stream IS, returning the // associated value in a new string. @@ -224,9 +224,8 @@ // # length: 5 // array // -// FIXME: this format is fairly rigid, and doesn't allow for -// arbitrary comments. Someone should fix that. It does allow arbitrary -// types however. +// FIXME: This format is fairly rigid, and doesn't allow for arbitrary comments. +// Someone should fix that. It does allow arbitrary types however. // Ugh. The signature of the compare method is not standard in older // versions of the GNU libstdc++. Do this instead: @@ -234,7 +233,7 @@ #define SUBSTRING_COMPARE_EQ(s, pos, n, t) (s.substr (pos, n) == t) std::string -read_ascii_data (std::istream& is, const std::string& filename, bool& global, +read_text_data (std::istream& is, const std::string& filename, bool& global, octave_value& tc, octave_idx_type count) { // Read name for this entry or break on EOF. @@ -299,7 +298,7 @@ // Save the data from TC along with the corresponding NAME, and global // flag MARK_AS_GLOBAL on stream OS in the plain text format described -// above for load_ascii_data. If NAME is empty, the name: line is not +// above for load_text_data. If NAME is empty, the name: line is not // generated. PRECISION specifies the number of decimal digits to print. // // Assumes ranges and strings cannot contain Inf or NaN values. @@ -309,9 +308,9 @@ // FIXME: should probably write the help string here too. bool -save_ascii_data (std::ostream& os, const octave_value& val_arg, - const std::string& name, bool mark_as_global, - int precision) +save_text_data (std::ostream& os, const octave_value& val_arg, + const std::string& name, bool mark_as_global, + int precision) { bool success = true; @@ -345,10 +344,10 @@ } bool -save_ascii_data_for_plotting (std::ostream& os, const octave_value& t, - const std::string& name) +save_text_data_for_plotting (std::ostream& os, const octave_value& t, + const std::string& name) { - return save_ascii_data (os, t, name, false, 6); + return save_text_data (os, t, name, false, 6); } // Maybe this should be a static function in tree-plot.cc?
rename from libinterp/corefcn/ls-oct-ascii.h rename to libinterp/corefcn/ls-oct-text.h --- a/libinterp/corefcn/ls-oct-ascii.h +++ b/libinterp/corefcn/ls-oct-text.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ls_oct_ascii_h) -#define octave_ls_oct_ascii_h 1 +#if !defined (octave_ls_oct_text_h) +#define octave_ls_oct_text_h 1 #include <cfloat> @@ -46,15 +46,15 @@ const bool next_only = false); extern OCTINTERP_API std::string -read_ascii_data (std::istream& is, const std::string& filename, bool& global, +read_text_data (std::istream& is, const std::string& filename, bool& global, octave_value& tc, octave_idx_type count); extern OCTINTERP_API bool -save_ascii_data (std::ostream& os, const octave_value& val_arg, +save_text_data (std::ostream& os, const octave_value& val_arg, const std::string& name, bool mark_as_global, int precision); extern OCTINTERP_API bool -save_ascii_data_for_plotting (std::ostream& os, const octave_value& t, +save_text_data_for_plotting (std::ostream& os, const octave_value& t, const std::string& name); extern OCTINTERP_API bool
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -53,7 +53,7 @@ libinterp/corefcn/ls-mat-ascii.h \ libinterp/corefcn/ls-mat4.h \ libinterp/corefcn/ls-mat5.h \ - libinterp/corefcn/ls-oct-ascii.h \ + libinterp/corefcn/ls-oct-text.h \ libinterp/corefcn/ls-oct-binary.h \ libinterp/corefcn/ls-utils.h \ libinterp/corefcn/mex.h \ @@ -182,7 +182,7 @@ libinterp/corefcn/ls-mat-ascii.cc \ libinterp/corefcn/ls-mat4.cc \ libinterp/corefcn/ls-mat5.cc \ - libinterp/corefcn/ls-oct-ascii.cc \ + libinterp/corefcn/ls-oct-text.cc \ libinterp/corefcn/ls-oct-binary.cc \ libinterp/corefcn/ls-utils.cc \ libinterp/corefcn/lsode.cc \
--- a/libinterp/octave-value/ov-base-diag.cc +++ b/libinterp/octave-value/ov-base-diag.cc @@ -38,7 +38,7 @@ #include "oct-stream.h" #include "ops.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" template <class DMT, class MT> octave_value
--- a/libinterp/octave-value/ov-base-int.cc +++ b/libinterp/octave-value/ov-base-int.cc @@ -52,7 +52,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-base-sparse.cc +++ b/libinterp/octave-value/ov-base-sparse.cc @@ -35,7 +35,7 @@ #include "pr-output.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-bool-mat.cc +++ b/libinterp/octave-value/ov-bool-mat.cc @@ -47,7 +47,7 @@ #include "pr-output.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" #include "ls-utils.h"
--- a/libinterp/octave-value/ov-bool.cc +++ b/libinterp/octave-value/ov-bool.cc @@ -42,7 +42,7 @@ #include "ov-scalar.h" #include "pr-output.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" template class octave_base_scalar<bool>;
--- a/libinterp/octave-value/ov-cell.cc +++ b/libinterp/octave-value/ov-cell.cc @@ -53,7 +53,7 @@ #include "ov-scalar.h" #include "gripes.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-oct-binary.h" #include "ls-hdf5.h" #include "ls-utils.h" @@ -777,7 +777,7 @@ octave_value o_val = tmp.elem (i); // Recurse to print sub-value. - bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); + bool b = save_text_data (os, o_val, CELL_ELT_TAG, false, 0); if (! b) return ! os.fail (); @@ -799,7 +799,7 @@ octave_value o_val = tmp.elem (i, j); // Recurse to print sub-value. - bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); + bool b = save_text_data (os, o_val, CELL_ELT_TAG, false, 0); if (! b) return ! os.fail (); @@ -849,7 +849,7 @@ bool dummy; // recurse to read cell elements - std::string nm = read_ascii_data (is, std::string (), + std::string nm = read_text_data (is, std::string (), dummy, t2, i); if (nm == CELL_ELT_TAG) @@ -898,7 +898,7 @@ bool dummy; // recurse to read cell elements - std::string nm = read_ascii_data (is, std::string (), + std::string nm = read_text_data (is, std::string (), dummy, t2, i); if (nm == CELL_ELT_TAG)
--- a/libinterp/octave-value/ov-class.cc +++ b/libinterp/octave-value/ov-class.cc @@ -39,7 +39,7 @@ #include "gripes.h" #include "load-path.h" #include "ls-hdf5.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-oct-binary.h" #include "ls-utils.h" #include "mxarray.h" @@ -1277,7 +1277,7 @@ { octave_value val = map.contents (i); - bool b = save_ascii_data (os, val, m.key (i), false, 0); + bool b = save_text_data (os, val, m.key (i), false, 0); if (! b) return ! os.fail (); @@ -1310,7 +1310,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;
--- a/libinterp/octave-value/ov-complex.cc +++ b/libinterp/octave-value/ov-complex.cc @@ -46,7 +46,7 @@ #include "pr-output.h" #include "ops.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" template class octave_base_scalar<Complex>;
--- a/libinterp/octave-value/ov-cx-mat.cc +++ b/libinterp/octave-value/ov-cx-mat.cc @@ -53,7 +53,7 @@ #include "pr-output.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" #include "ls-utils.h"
--- a/libinterp/octave-value/ov-fcn-handle.cc +++ b/libinterp/octave-value/ov-fcn-handle.cc @@ -61,7 +61,7 @@ #include "byte-swap.h" #include "ls-ascii-helper.h" #include "ls-hdf5.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-oct-binary.h" #include "ls-utils.h" @@ -379,7 +379,7 @@ for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin (); p != vars.end (); p++) { - if (! save_ascii_data (os, p->varval (0), p->name (), false, 0)) + if (! save_text_data (os, p->varval (0), p->name (), false, 0)) return ! os.fail (); } } @@ -462,7 +462,7 @@ bool dummy; std::string name - = read_ascii_data (is, std::string (), dummy, t2, i); + = read_text_data (is, std::string (), dummy, t2, i); if (!is) {
--- a/libinterp/octave-value/ov-fcn-inline.cc +++ b/libinterp/octave-value/ov-fcn-inline.cc @@ -50,7 +50,7 @@ #include "byte-swap.h" #include "ls-ascii-helper.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" #include "ls-utils.h"
--- a/libinterp/octave-value/ov-float.cc +++ b/libinterp/octave-value/ov-float.cc @@ -49,7 +49,7 @@ #include "xpow.h" #include "ops.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" template class octave_base_scalar<float>;
--- a/libinterp/octave-value/ov-flt-complex.cc +++ b/libinterp/octave-value/ov-flt-complex.cc @@ -46,7 +46,7 @@ #include "pr-output.h" #include "ops.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" template class octave_base_scalar<FloatComplex>;
--- a/libinterp/octave-value/ov-flt-cx-mat.cc +++ b/libinterp/octave-value/ov-flt-cx-mat.cc @@ -57,7 +57,7 @@ #include "ops.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" #include "ls-utils.h"
--- a/libinterp/octave-value/ov-flt-re-mat.cc +++ b/libinterp/octave-value/ov-flt-re-mat.cc @@ -65,7 +65,7 @@ #include "ops.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-int16.cc +++ b/libinterp/octave-value/ov-int16.cc @@ -52,7 +52,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-int32.cc +++ b/libinterp/octave-value/ov-int32.cc @@ -52,7 +52,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-int64.cc +++ b/libinterp/octave-value/ov-int64.cc @@ -52,7 +52,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-int8.cc +++ b/libinterp/octave-value/ov-int8.cc @@ -52,7 +52,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-lazy-idx.cc +++ b/libinterp/octave-value/ov-lazy-idx.cc @@ -27,7 +27,7 @@ #include "ov-lazy-idx.h" #include "ops.h" #include "ov-scalar.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-oct-binary.h" DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_lazy_index, "lazy_index", "double"); @@ -161,14 +161,14 @@ bool octave_lazy_index::save_ascii (std::ostream& os) { - return save_ascii_data (os, make_value (), value_save_tag, false, 0); + return save_text_data (os, make_value (), value_save_tag, false, 0); } bool octave_lazy_index::load_ascii (std::istream& is) { bool dummy; - std::string nm = read_ascii_data (is, std::string (), dummy, value, 0); + std::string nm = read_text_data (is, std::string (), dummy, value, 0); if (nm != value_save_tag) error ("lazy_index: corrupted data on load");
--- a/libinterp/octave-value/ov-perm.cc +++ b/libinterp/octave-value/ov-perm.cc @@ -36,7 +36,7 @@ #include "ops.h" #include "pr-output.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" octave_value octave_perm_matrix::subsref (const std::string& type,
--- a/libinterp/octave-value/ov-re-mat.cc +++ b/libinterp/octave-value/ov-re-mat.cc @@ -65,7 +65,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-scalar.cc +++ b/libinterp/octave-value/ov-scalar.cc @@ -49,7 +49,7 @@ #include "xpow.h" #include "ops.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-hdf5.h" template class octave_base_scalar<double>;
--- a/libinterp/octave-value/ov-str-mat.cc +++ b/libinterp/octave-value/ov-str-mat.cc @@ -41,7 +41,7 @@ #include "gripes.h" #include "ls-ascii-helper.h" #include "ls-hdf5.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "oct-obj.h" #include "oct-hdf5.h"
--- 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;
--- a/libinterp/octave-value/ov-uint16.cc +++ b/libinterp/octave-value/ov-uint16.cc @@ -52,7 +52,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"
--- a/libinterp/octave-value/ov-uint32.cc +++ b/libinterp/octave-value/ov-uint32.cc @@ -52,7 +52,7 @@ #include "variables.h" #include "byte-swap.h" -#include "ls-oct-ascii.h" +#include "ls-oct-text.h" #include "ls-utils.h" #include "ls-hdf5.h"