Mercurial > hg > octave-lyh
diff libinterp/parse-tree/lex.h @ 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 | b7ca669af528 |
| children | 810a71122c25 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.h +++ b/libinterp/parse-tree/lex.h @@ -27,6 +27,8 @@ #include <set> #include <stack> +#include "input.h" + extern OCTINTERP_API void cleanup_parser (void); // Is the given string a keyword? @@ -317,8 +319,7 @@ : buffer (), pos (0), chars_left (0), eof (false) { } - // Grab more input from the current input source. - void read (void); + void fill (const std::string& input, bool eof_arg); // Copy at most max_size characters to buf. int copy_chunk (char *buf, size_t max_size); @@ -336,7 +337,21 @@ }; octave_lexer (void) - : lexical_feedback (), scanner (0), input_buf () + : lexical_feedback (), scanner (0), input_buf (), input_reader () + { + init (); + } + + octave_lexer (FILE *file) + : lexical_feedback (), scanner (0), input_buf (), + input_reader (file) + { + init (); + } + + octave_lexer (const std::string& eval_string) + : lexical_feedback (), scanner (0), input_buf (), + input_reader (eval_string) { init (); } @@ -351,7 +366,7 @@ void prep_for_function_file (void); - int octave_read (char *buf, unsigned int max_size); + int read (char *buf, unsigned int max_size); int handle_end_of_input (void); @@ -448,6 +463,18 @@ // Object that reads and buffers input. input_buffer input_buf; + octave_input_reader input_reader; + + std::string input_source (void) const + { + return input_reader.input_source (); + } + + bool input_from_eval_string (void) const + { + return input_source () == "eval_string"; + } + // For unwind protect. static void cleanup (octave_lexer *lexer) { delete lexer; }