Mercurial > octave-nkf
view libinterp/corefcn/ls-ascii-helper.cc @ 20482: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 | 4197fc428c7d |
children |
line wrap: on
line source
/* Copyright (C) 2009-2015 Benjamin Lindner 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 "ls-ascii-helper.h" #include <iostream> #include <sstream> // Helper functions when reading from ascii files. // These function take care of CR/LF issues when files are opened in // text-mode for reading. // Skip characters from stream IS until a newline is reached. // Depending on KEEP_NEWLINE, either eat newline from stream or // keep it unread. void skip_until_newline (std::istream& is, bool keep_newline) { if (! is) return; while (is) { char c = is.peek (); if (c == '\n' || c == '\r') { // Reached newline. if (! keep_newline) { // Eat the CR or LF character. char d; is.get (d); // Make sure that for binary-mode opened ascii files // containing CRLF line endings we skip the LF after CR. if (c == '\r' && is.peek () == '\n') { // Yes, LF following CR, eat it. is.get (d); } } // Newline was found, and read from stream if // keep_newline == true, so exit loop. break; } else { // No newline charater peeked, so read it and proceed to next // character. char d; is.get (d); } } } // If stream IS currently points to a newline (a leftover from a // previous read) then eat newline(s) until a non-newline character is // found. void skip_preceeding_newline (std::istream& is) { if (! is) return; // Check whether IS currently points to newline character. char c = is.peek (); if (c == '\n' || c == '\r') { // Yes, at newline. do { // Eat the CR or LF character. char d; is.get (d); // Make sure that for binary-mode opened ascii files // containing CRLF line endings we skip the LF after CR. if (c == '\r' && is.peek () == '\n') { // Yes, LF following CR, eat it. is.get (d); } // Peek into next character. c = is.peek (); // Loop while still a newline ahead. } while (c == '\n' || c == '\r'); } } // Read charaters from stream IS until a newline is reached. // Depending on KEEP_NEWLINE, either eat newline from stream or keep // it unread. Characters read are stored and returned as // std::string. std::string read_until_newline (std::istream& is, bool keep_newline) { if (! is) return std::string (); std::ostringstream buf; while (is) { char c = is.peek (); if (c == '\n' || c == '\r') { // Reached newline. if (! keep_newline) { // Eat the CR or LF character. char d; is.get (d); // Make sure that for binary-mode opened ascii files // containing CRLF line endings we skip the LF after // CR. if (c == '\r' && is.peek () == '\n') { // Yes, LF following CR, eat it. is.get (d); } } // Newline was found, and read from stream if // keep_newline == true, so exit loop. break; } else { // No newline charater peeked, so read it, store it, and // proceed to next. char d; is.get (d); buf << d; } } return buf.str (); }