Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-const.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 | 2fc554ffbc28 |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 1993-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 <iostream> #include "error.h" #include "oct-obj.h" #include "pager.h" #include "pt-const.h" #include "pt-walk.h" // We are likely to have a lot of tree_constant objects to allocate, // so make the grow_size large. DEFINE_OCTAVE_ALLOCATOR2 (tree_constant, 1024); void tree_constant::print (std::ostream& os, bool pr_as_read_syntax, bool pr_orig_text) { if (pr_orig_text && ! orig_text.empty ()) os << orig_text; else val.print (os, pr_as_read_syntax); } void tree_constant::print_raw (std::ostream& os, bool pr_as_read_syntax, bool pr_orig_text) { if (pr_orig_text && ! orig_text.empty ()) os << orig_text; else val.print_raw (os, pr_as_read_syntax); } octave_value_list tree_constant::rvalue (int nargout) { octave_value_list retval; if (nargout > 1) error ("invalid number of output arguments for constant expression"); else retval = rvalue1 (nargout); return retval; } tree_expression * tree_constant::dup (symbol_table::scope_id, symbol_table::context_id) const { tree_constant *new_tc = new tree_constant (val, orig_text, line (), column ()); new_tc->copy_base (*this); return new_tc; } void tree_constant::accept (tree_walker& tw) { tw.visit_constant (*this); }