Mercurial > hg > octave-nkf
view libinterp/corefcn/oct-iostrm.cc @ 17731:f79bf671a493
eliminate global LEXER variable
* input.h, input.cc (octave_base_reader::lexer): New member variable.
(octave_base_reader::octave_base_reader): Initialize lexer.
(octave_base_reader::octave_base_reader (const octave_base_reader&)):
Also copy pflag and lexer.
(octave_base_reader::reading_fcn_file,
octave_base_reader::reading_classdef_file,
octave_base_reader::reading_script_file): New functions.
(octave_base_reader::do_input_echo): Call reading_script file instead
of using global LEXER variable.
(get_user_input): Don't user global LEXER variable. Only check
interactive and forced_interactive to decide whether to temporarily
set forced_interactive to true.
(octave_terminal_reader::octave_terminal_reader,
octave_file_reader::octave_file_reader,
octave_eval_string_reader::octave_eval_string_reader,
octave_input_reader::octave_input_reader):
New optional arg, lexer.
* toplev.cc (main_loop): Don't user global LEXER variable. Eliminate
unused unwind_protect frame.
* lex.h, lex.ll (octave_base_lexer::cleanup): Delete unused function.
(octave_lexer::octave_lexer): Pass this to input_reader initializer.
* parse.h, oct-parse.in.yy (octave_base_parser::init):
Delete unneded function.
(octave_base_parser::octave_base_parser, octave_push_parser::init, octave_push_parser::octave_push_parser):
Don't call octave_base_parser::init.
(eval_string): Don't use global LEXER variable. Eliminate unused
unwind_protect frame.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 22 Oct 2013 18:43:36 -0400 |
parents | 68fc671a9339 |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 1996-2012 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 "error.h" #include "oct-iostrm.h" // Position a stream at OFFSET relative to ORIGIN. int octave_base_iostream::seek (off_t, int) { invalid_operation (); return -1; } // Return current stream position. off_t octave_base_iostream::tell (void) { invalid_operation (); return -1; } // Return non-zero if EOF has been reached on this stream. bool octave_base_iostream::eof (void) const { invalid_operation (); return false; } void octave_base_iostream::invalid_operation (void) const { ::error ("%s: invalid operation", stream_type ()); } // Return non-zero if EOF has been reached on this stream. bool octave_istream::eof (void) const { return is && is->eof (); } octave_stream octave_istream::create (std::istream *arg, const std::string& n) { return octave_stream (new octave_istream (arg, n)); } // Return non-zero if EOF has been reached on this stream. bool octave_ostream::eof (void) const { return os && os->eof (); } octave_stream octave_ostream::create (std::ostream *arg, const std::string& n) { return octave_stream (new octave_ostream (arg, n)); }