Mercurial > jwe > octave
view libinterp/corefcn/ls-ascii-helper.cc @ 21017:93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
* Backend.cc, comment-list.h, debug.cc, defaults.in.h, dynamic-ld.h, error.cc,
graphics.cc, graphics.in.h, help.cc, hook-fcn.h, load-path.cc, load-path.h,
ls-ascii-helper.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-mat5.h, ls-oct-text.cc,
oct-iostrm.h, oct-lvalue.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
regexp.cc, schur.cc, sqrtm.cc, strfns.cc, symtab.cc, symtab.h, sysdep.cc,
toplev.cc, urlwrite.cc, variables.cc, variables.h, ov-builtin.h, ov-cell.cc,
ov-class.cc, ov-classdef.cc, ov-classdef.h, ov-dld-fcn.h, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.h, ov-lazy-idx.cc, ov-mex-fcn.h,
ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.h,
ovl.h, octave.cc, lex.h, parse.h, pt-classdef.h, pt-exp.cc, pt-pr-code.h,
token.h, version.cc, version.in.h, oct-rand.h, dir-ops.h, file-ops.cc,
file-ops.h, file-stat.h, oct-env.cc, oct-group.cc, oct-passwd.cc,
oct-syscalls.cc, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, kpse.cc,
lo-array-gripes.h, pathsearch.cc, pathsearch.h, str-vec.h, url-transfer.h:
Replace emtpy 'std::string ()' calls with "".
author | Rik <rik@octave.org> |
---|---|
date | Wed, 30 Dec 2015 12:33:33 -0800 |
parents | 4197fc428c7d |
children | fcac5dbbf9ed |
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::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 (); }