Mercurial > hg > octave-lyh
comparison libinterp/interpfcn/input.cc @ 16139:2fd39ab12209
move a function and data member from lexical_feedback to octave_parser
* parse.h: Include lex.h.
* parse.h, oct-parse.yy (octave_parser::reset): New function.
(octave_parser::end_of_input): New data member.
(octave_parser::octave_parser): Initialize it.
* lex.h, lex.ll (lexical_feedback::reset): Rename from reset_parser.
(lexical_feedback::parser_end_of_input): Delete.
* input.cc (get_debug_input): Call octave_parser::reset, not
lexical_feedback::reset_parser.
* toplev.cc (main_loop): Likewise.
* oct-parse.yy (eval_string, parse_fcn_file): Likewise.
* toplev.cc (main_loop): Set octave_parser::end_of_input, not
lexical_feedback::parser_end_of_input.
* oct-parse.yy: Use octave_parser::end_of_input, not
lexical_feedback::parser_end_of_input.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 27 Feb 2013 13:09:33 -0500 |
| parents | 284e2ca86ef7 |
| children | 49dfba4fd3c5 |
comparison
equal
deleted
inserted
replaced
| 16138:284e2ca86ef7 | 16139:2fd39ab12209 |
|---|---|
| 690 { | 690 { |
| 691 unwind_protect middle_frame; | 691 unwind_protect middle_frame; |
| 692 | 692 |
| 693 reset_error_handler (); | 693 reset_error_handler (); |
| 694 | 694 |
| 695 curr_lexer->reset_parser (); | 695 curr_parser->reset (); |
| 696 | 696 |
| 697 // Save current value of global_command. | 697 // Save current value of global_command. |
| 698 middle_frame.protect_var (global_command); | 698 middle_frame.protect_var (global_command); |
| 699 | 699 |
| 700 global_command = 0; | 700 global_command = 0; |