Mercurial > hg > octave-nkf
diff libinterp/parse-tree/lex.h @ 16102:679a54d274d9
move global parser_end_of_input variable to lexical_feedback class
* lex.h, lex.ll (parser_end_of_input): Move global variable to
lexical_feedback class. Change all uses.
(reset_parser): Don't reset parser_end_of_input here.
* oct-parse.yy (eval_string, parse_fcn_file): Add lexer_flags object
to unwind_protect stack. Don't protect parser_end_of_input.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 25 Feb 2013 20:26:52 -0500 |
| parents | 8d19626b38ae |
| children | 6434f70f0ee0 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.h +++ b/libinterp/parse-tree/lex.h @@ -71,7 +71,8 @@ looking_for_object_index (false), looking_at_indirect_ref (false), parsing_class_method (false), maybe_classdef_get_set_method (false), parsing_classdef (false), - quote_is_transpose (false), bracketflag (0), braceflag (0), + quote_is_transpose (false), parser_end_of_input (false), + bracketflag (0), braceflag (0), looping (0), defining_func (0), looking_at_function_handle (0), looking_at_object_index (), parsed_function_name (), pending_local_variables () @@ -95,6 +96,7 @@ maybe_classdef_get_set_method (lf.maybe_classdef_get_set_method), parsing_classdef (lf.parsing_classdef), quote_is_transpose (lf.quote_is_transpose), + parser_end_of_input (lf.parser_end_of_input), bracketflag (lf.bracketflag), braceflag (lf.braceflag), looping (lf.looping), @@ -124,6 +126,7 @@ maybe_classdef_get_set_method = lf.maybe_classdef_get_set_method; parsing_classdef = lf.parsing_classdef; quote_is_transpose = lf.quote_is_transpose; + parser_end_of_input = lf.parser_end_of_input; bracketflag = lf.bracketflag; braceflag = lf.braceflag; looping = lf.looping; @@ -199,6 +202,9 @@ // Return transpose or start a string? bool quote_is_transpose; + // TRUE means that we have encountered EOF on the input stream. + bool parser_end_of_input; + // Square bracket level count. int bracketflag; @@ -248,9 +254,6 @@ extern std::string grab_comment_block (stream_reader& reader, bool at_bol, bool& eof); -// TRUE means that we have encountered EOF on the input stream. -extern bool parser_end_of_input; - // Flags that need to be shared between the lexer and parser. extern lexical_feedback lexer_flags;