Mercurial > hg > octave-nkf
view scripts/sparse/module.mk @ 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 | 9106fdfc03e8 |
children | ea9992fd9c89 |
line wrap: on
line source
FCN_FILE_DIRS += sparse sparse_PRIVATE_FCN_FILES = \ sparse/private/__sprand_impl__.m sparse_FCN_FILES = \ sparse/bicg.m \ sparse/bicgstab.m \ sparse/cgs.m \ sparse/colperm.m \ sparse/etreeplot.m \ sparse/gmres.m \ sparse/gplot.m \ sparse/nonzeros.m \ sparse/pcg.m \ sparse/pcr.m \ sparse/spaugment.m \ sparse/spconvert.m \ sparse/spdiags.m \ sparse/speye.m \ sparse/spfun.m \ sparse/spones.m \ sparse/sprand.m \ sparse/sprandn.m \ sparse/sprandsym.m \ sparse/spstats.m \ sparse/spy.m \ sparse/svds.m \ sparse/treelayout.m \ sparse/treeplot.m \ $(sparse_PRIVATE_FCN_FILES) FCN_FILES += $(sparse_FCN_FILES) PKG_ADD_FILES += sparse/PKG_ADD DIRSTAMP_FILES += sparse/$(octave_dirstamp)