Mercurial > hg > octave-nkf
view libinterp/corefcn/oct-fstrm.h @ 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/>. */ #if !defined (octave_octave_fstream_h) #define octave_octave_fstream_h 1 #include <fstream> #include <string> #include "oct-stream.h" class octave_fstream : public octave_base_stream { public: octave_fstream (const std::string& nm_arg, std::ios::openmode arg_md = std::ios::in|std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native_float_format ()); static octave_stream create (const std::string& nm_arg, std::ios::openmode arg_md = std::ios::in|std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native_float_format ()); // Position a stream at OFFSET relative to ORIGIN. int seek (off_t offset, int origin); // Return current stream position. off_t tell (void); // Return non-zero if EOF has been reached on this stream. bool eof (void) const; void do_close (void); // The name of the file. std::string name (void) const { return nm; } std::istream *input_stream (void); std::ostream *output_stream (void); protected: ~octave_fstream (void) { } private: std::string nm; std::fstream fs; // No copying! octave_fstream (const octave_fstream&); octave_fstream& operator = (const octave_fstream&); }; #endif