Mercurial > hg > octave-nkf
view libinterp/corefcn/__dispatch__.cc @ 16195:b52d2f9294b6
use class for reading lexer input
* input.h, input.cc (octave_base_input_reader, octave_terminal_reader,
octave_file_reader, octave_eval_string_reader): New classes.
(octave_gets): Now a member function of octave_base_reader.
(get_user_input): Delete function. Move actions to
octave_terminal_reader::get_input and
octave_eval_string_reader::get_input.
function. Call from octave_file_reader::get_input. Don't check
whether reading an eval string.
(current_eval_string, get_input_from_eval_string): Delete global
variables.
(get_debug_input): Check CURR_LEXER->input_from_eval_string instead of
global get_input_from_eval_string variable. Don't protect
get_input_from_eval_string.
* lex.h (octave_lexer::input_reader): New data member.
(octave_lexer::octave_lexer (void)): Initialize it.
(octave_lexer::octave_lexer (const std::string&),
octave_lexer::octave_lexer (FILE *)): New constructors.
* lex.h, lex.cc (octave_lexer::input_buffer::fill): New function.
(octave_lexer::input_buffer::read): Delete.
(octave_lexer::read): Rename from octave_read. Call reader to get
input, and then hand it to the input_buffer instead of asking the
input buffer to read input. Change all callers.
(octave_lexer::input_source, octave_lexer::input_from_eval_string):
New functions. Call octave_lexer::input_from_eval_string instead of
using get_input_from_eval_string.
* oct-parse.in.yy (octave_parser::octave_parser (FILE *),
octave_parser::octave_parser (const std::string&)): New constructors.
(parse_fcn_file): Pass FILE pointer to octave_parser constructor.
(eval_string): Pass string to octave_parser constructor instead of
setting global current_eval_string variable.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 05 Mar 2013 10:19:51 -0500 |
parents | 2fc554ffbc28 |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 2001-2012 John W. Eaton and Paul Kienzle 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 <list> #include <map> #include <string> #include "Cell.h" #include "oct-map.h" #include "defun.h" #include "ov.h" #include "ov-fcn.h" #include "ov-typeinfo.h" #include "pager.h" #include "parse.h" #include "symtab.h" #include "variables.h" DEFUN (__dispatch__, args, nargout, "Undocumented internal function") { octave_value retval; int nargin = args.length (); std::string f, r, t; if (nargin > 0 && nargin < 4) { if (nargin > 0) { f = args(0).string_value (); if (error_state) { error ("__dispatch__: first argument must be a function name"); return retval; } } if (nargin > 1) { r = args(1).string_value (); if (error_state) { error ("__dispatch__: second argument must be a function name"); return retval; } } if (nargin > 2) { t = args(2).string_value (); if (error_state) { error ("__dispatch__: third argument must be a type name"); return retval; } } if (nargin == 1) { if (nargout > 0) { symbol_table::fcn_info::dispatch_map_type dm = symbol_table::get_dispatch (f); size_t len = dm.size (); Cell type_field (len, 1); Cell name_field (len, 1); symbol_table::fcn_info::dispatch_map_type::const_iterator p = dm.begin (); for (size_t i = 0; i < len; i++) { type_field(i) = p->first; name_field(i) = p->second; p++; } octave_scalar_map m; m.assign ("type", type_field); m.assign ("name", name_field); retval = m; } else symbol_table::print_dispatch (octave_stdout, f); } else if (nargin == 2) { t = r; symbol_table::clear_dispatch (f, t); } else symbol_table::add_dispatch (f, t, r); } else print_usage (); return retval; } /* ## No test needed for internal helper function. %!assert (1) */