Mercurial > octave-nkf
view libinterp/corefcn/ls-mat-ascii.cc @ 20569:b70cc4bd8109
begin removal of global error_state variable
* gripes.h, gripes.cc (gripe_library_execution_error): Delete.
* error.cc (warning_state): Delete unused variable.
(reset_error_handler): Don't set warning_state or error_state.
(debug_or_throw_exception): New static function.
(verror): Don't check error_state.
(vmessage): Call debug_or_throw_exception instead of setting
error_state.
(error_1, error_2): Combine into single function, error_1 that prints
error message and ultimately calls debug_or_throw_exception.
(verror, verror_with_cfn, verror_with_id_cfn): Call error_1. Don't
check or set warning_state.
(error): Don't check error_state.
(Flasterror, Flasterr): Adapt to not using error_state.
(interpreter_try): Don't unwind_protect error_state.
* NEWS: Update.
* doc/interpreter/external.txi: Explain octave_execution_exception
instead of error_state for matrix addition example.
* jit-typeinfo.cc (octave_jit_gripe_nan_to_logical_conversion,
octave_jit_ginvalid_index, octave_jit_gindex_range,
octave_jit_paren_scalar, octave_jit_paren_scalar_subsasgn):
Don't catch octave_execution_exception.
* cellfun.cc (Fcellfun): Use exceptions instead of error_state.
* ls-mat-ascii.cc (save_mat_ascii_data): Likewise.
* mex.cc (mexCallMATLAB, mexEvalString): Likewise.
* variables.cc (safe_symbol_lookup): Likewise.
* svd.cc (Fsvd): Eliminate use of error_state.
* __magick_read__.cc (read_file, write_file): Likewise.
* variables.cc (generate_struct_completions): Eliminate use of
obsolete warning_state variable.
* ov-builtin.cc (octave_builtin::do_multi_index_op): Don't catch
octave_execution_exception and call gripe_library_execution_error.
* ov-class.cc (octave_class::reconstruct_exemplar): Eliminate use of
error_state. Catch possible octave_execution_exception in
do_multi_index_op.
* ov-mex-fcn.cc (octave_mex_function::do_multi_index_op): Eliminate
use of error_state. Catch possible octave_execution_exception in
call_mex.
* ov-fcn-handle.cc (octave_fcn_binder::maybe_binder): Eliminate use of
error_state.
* ov-oncleanup.cc (octave_oncleanup::~octave_oncleanup): Eliminate use
of error_state. Propagate possible octave_execution_exception from
do_multi_index_op.
* ov.cc (octave_value::assign, do_binary_op, do_unary_op,
octave_value::do_non_const_unary_op): Don't catch
octave_execution_exception here.
* oct-parse.in.yy (octave_base_parser::finish_colon_expression,
octave_base_parser::finish_array_list): Eliminate use of warning_state
and error_state.
(Feval, Fevalin): Use exceptions instead of error_state.
* pt-eval.cc, pt-eval.h (tree_evaluator::unwind_protect_exception):
New static variable.
* (tree_evaluator::visit_statement): Don't catch
octave_execution_exception here.
(tree_evaluator::visit_try_catch_command,
tree_evaluator::do_unwind_protect_cleanup): Eliminate use of error_state.
(tree_evaluator::visit_unwind_protect_command): Use
unwind_protect_exception to track whether an exception has occurred in
the try block.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 01 Oct 2015 16:18:19 -0400 |
parents | 17d647821d61 |
children | f90c8372b7ba |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cfloat> #include <cstring> #include <cctype> #include <fstream> #include <iomanip> #include <iostream> #include <sstream> #include <string> #include "byte-swap.h" #include "data-conv.h" #include "file-ops.h" #include "glob-match.h" #include "lo-mappers.h" #include "mach-info.h" #include "oct-env.h" #include "oct-time.h" #include "quit.h" #include "str-vec.h" #include "Cell.h" #include "defun.h" #include "error.h" #include "gripes.h" #include "lex.h" #include "load-save.h" #include "ls-ascii-helper.h" #include "ls-mat-ascii.h" #include "oct-obj.h" #include "oct-map.h" #include "ov-cell.h" #include "pager.h" #include "pt-exp.h" #include "sysdep.h" #include "unwind-prot.h" #include "utils.h" #include "variables.h" #include "version.h" #include "dMatrix.h" static std::string get_mat_data_input_line (std::istream& is) { std::string retval; bool have_data = false; do { retval = ""; char c; while (is.get (c)) { if (c == '\n' || c == '\r') { is.putback (c); skip_preceeding_newline (is); break; } if (c == '%' || c == '#') { skip_until_newline (is, false); break; } if (! is.eof ()) { if (! have_data && c != ' ' && c != '\t') have_data = true; retval += c; } } } while (! (have_data || is.eof ())); return retval; } static void get_lines_and_columns (std::istream& is, octave_idx_type& nr, octave_idx_type& nc, const std::string& filename = std::string (), bool quiet = false, bool check_numeric = false) { std::streampos pos = is.tellg (); int file_line_number = 0; nr = 0; nc = 0; while (is && ! error_state) { octave_quit (); std::string buf = get_mat_data_input_line (is); file_line_number++; size_t beg = buf.find_first_not_of (", \t"); // If we see a CR as the last character in the buffer, we had a // CRLF pair as the line separator. Any other CR in the text // will not be considered as whitespace. if (beg != std::string::npos && buf[beg] == '\r' && beg == buf.length () - 1) { // We had a blank line ending with a CRLF. Handle it the // same as an empty line. beg = std::string::npos; } octave_idx_type tmp_nc = 0; while (beg != std::string::npos) { tmp_nc++; size_t end = buf.find_first_of (", \t", beg); if (end != std::string::npos) { if (check_numeric) { std::istringstream tmp_stream (buf.substr (beg, end-beg)); octave_read_double (tmp_stream); if (tmp_stream.fail ()) { if (! quiet) error ("load: %s: non-numeric data found near line %d", filename.c_str (), file_line_number); nr = 0; nc = 0; goto done; } } beg = buf.find_first_not_of (", \t", end); if (beg == std::string::npos || (buf[beg] == '\r' && beg == buf.length () - 1)) { // We had a line with trailing spaces and // ending with a CRLF, so this should look like EOL, // not a new colum. break; } } else break; } if (tmp_nc > 0) { if (nc == 0) { nc = tmp_nc; nr++; } else if (nc == tmp_nc) nr++; else { if (! quiet) error ("load: %s: inconsistent number of columns near line %d", filename.c_str (), file_line_number); nr = 0; nc = 0; goto done; } } } if (! quiet && (nr == 0 || nc == 0)) error ("load: file '%s' seems to be empty!", filename.c_str ()); done: is.clear (); is.seekg (pos); } // Extract a matrix from a file of numbers only. // // Comments are not allowed. The file should only have numeric values. // // Reads the file twice. Once to find the number of rows and columns, // and once to extract the matrix. // // FILENAME is used for error messages. // // This format provides no way to tag the data as global. std::string read_mat_ascii_data (std::istream& is, const std::string& filename, octave_value& tc) { std::string retval; std::string varname; size_t pos = filename.rfind ('/'); if (pos != std::string::npos) varname = filename.substr (pos+1); else varname = filename; pos = varname.rfind ('.'); if (pos != std::string::npos) varname = varname.substr (0, pos); size_t len = varname.length (); for (size_t i = 0; i < len; i++) { char c = varname[i]; if (! (isalnum (c) || c == '_')) varname[i] = '_'; } if (is_keyword (varname) || ! isalpha (varname[0])) varname.insert (0, "X"); if (valid_identifier (varname)) { octave_idx_type nr = 0; octave_idx_type nc = 0; int total_count = 0; get_lines_and_columns (is, nr, nc, filename); octave_quit (); if (! error_state && nr > 0 && nc > 0) { Matrix tmp (nr, nc); if (nr < 1 || nc < 1) is.clear (std::ios::badbit); else { double d; for (octave_idx_type i = 0; i < nr; i++) { std::string buf = get_mat_data_input_line (is); std::istringstream tmp_stream (buf); for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); d = octave_read_value<double> (tmp_stream); if (tmp_stream || tmp_stream.eof ()) { tmp.elem (i, j) = d; total_count++; // Skip whitespace and commas. char c; while (1) { tmp_stream >> c; if (! tmp_stream) break; if (! (c == ' ' || c == '\t' || c == ',')) { tmp_stream.putback (c); break; } } if (tmp_stream.eof ()) break; } else { error ("load: failed to read matrix from file '%s'", filename.c_str ()); return retval; } } } } if (is || is.eof ()) { // FIXME: not sure this is best, but it works. if (is.eof ()) is.clear (); octave_idx_type expected = nr * nc; if (expected == total_count) { tc = tmp; retval = varname; } else error ("load: expected %d elements, found %d", expected, total_count); } else error ("load: failed to read matrix from file '%s'", filename.c_str ()); } else error ("load: unable to extract matrix size from file '%s'", filename.c_str ()); } else error ("load: unable to convert filename '%s' to valid identifier", filename.c_str ()); return retval; } bool save_mat_ascii_data (std::ostream& os, const octave_value& val, int precision, bool tabs) { bool success = true; if (val.is_complex_type ()) warning ("save: omitting imaginary part for ASCII file"); Matrix m; try { m = val.matrix_value (true); } catch (const octave_execution_exception&) { success = false; } if (success) { long old_precision = os.precision (); os.precision (precision); std::ios::fmtflags oflags = os.flags (static_cast<std::ios::fmtflags> (std::ios::scientific)); if (tabs) { for (octave_idx_type i = 0; i < m.rows (); i++) { for (octave_idx_type j = 0; j < m.cols (); j++) { // Omit leading tabs. if (j != 0) os << '\t'; octave_write_double (os, m (i, j)); } os << "\n"; } } else os << m; os.flags (oflags); os.precision (old_precision); } return (os && success); } bool looks_like_mat_ascii_file (std::istream& is, const std::string& filename) { bool retval = false; octave_idx_type nr = 0; octave_idx_type nc = 0; get_lines_and_columns (is, nr, nc, filename, true, true); retval = (nr != 0 && nc != 0); return retval; }