Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/lex.h @ 16103:6434f70f0ee0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move input_line_number and current_input_column to lexical_feedback class * lex.h, lex.ll (input_line_number, current_input_column): Move global variables to lexical_feedback class. Change all uses. (reset_parser): Don't reset input_line_number or current_input_column. * oct-parse.yy (eval_string, parse_fcn_file): Don't protect input_line_number or current_input_column here. (parse_fcn_file): Protect lexer_flags prior to calling gobble_leading_whitespace. Use reset_parser to reset lexer_flags.
author John W. Eaton <jwe@octave.org>
date Mon, 25 Feb 2013 21:30:51 -0500
parents 679a54d274d9
children c8974e28da59
comparison
equal deleted inserted replaced
16102:679a54d274d9 16103:6434f70f0ee0
70 looking_at_matrix_or_assign_lhs (false), 70 looking_at_matrix_or_assign_lhs (false),
71 looking_for_object_index (false), 71 looking_for_object_index (false),
72 looking_at_indirect_ref (false), parsing_class_method (false), 72 looking_at_indirect_ref (false), parsing_class_method (false),
73 maybe_classdef_get_set_method (false), parsing_classdef (false), 73 maybe_classdef_get_set_method (false), parsing_classdef (false),
74 quote_is_transpose (false), parser_end_of_input (false), 74 quote_is_transpose (false), parser_end_of_input (false),
75 input_line_number (1), current_input_column (1),
75 bracketflag (0), braceflag (0), 76 bracketflag (0), braceflag (0),
76 looping (0), defining_func (0), looking_at_function_handle (0), 77 looping (0), defining_func (0), looking_at_function_handle (0),
77 looking_at_object_index (), parsed_function_name (), 78 looking_at_object_index (), parsed_function_name (),
78 pending_local_variables () 79 pending_local_variables ()
79 { 80 {
95 parsing_class_method (lf.parsing_class_method), 96 parsing_class_method (lf.parsing_class_method),
96 maybe_classdef_get_set_method (lf.maybe_classdef_get_set_method), 97 maybe_classdef_get_set_method (lf.maybe_classdef_get_set_method),
97 parsing_classdef (lf.parsing_classdef), 98 parsing_classdef (lf.parsing_classdef),
98 quote_is_transpose (lf.quote_is_transpose), 99 quote_is_transpose (lf.quote_is_transpose),
99 parser_end_of_input (lf.parser_end_of_input), 100 parser_end_of_input (lf.parser_end_of_input),
101 input_line_number (lf.input_line_number),
102 current_input_column (lf.current_input_column),
100 bracketflag (lf.bracketflag), 103 bracketflag (lf.bracketflag),
101 braceflag (lf.braceflag), 104 braceflag (lf.braceflag),
102 looping (lf.looping), 105 looping (lf.looping),
103 defining_func (lf.defining_func), 106 defining_func (lf.defining_func),
104 looking_at_function_handle (lf.looking_at_function_handle), 107 looking_at_function_handle (lf.looking_at_function_handle),
125 parsing_class_method = lf.parsing_class_method; 128 parsing_class_method = lf.parsing_class_method;
126 maybe_classdef_get_set_method = lf.maybe_classdef_get_set_method; 129 maybe_classdef_get_set_method = lf.maybe_classdef_get_set_method;
127 parsing_classdef = lf.parsing_classdef; 130 parsing_classdef = lf.parsing_classdef;
128 quote_is_transpose = lf.quote_is_transpose; 131 quote_is_transpose = lf.quote_is_transpose;
129 parser_end_of_input = lf.parser_end_of_input; 132 parser_end_of_input = lf.parser_end_of_input;
133 input_line_number = lf.input_line_number;
134 current_input_column = lf.current_input_column;
130 bracketflag = lf.bracketflag; 135 bracketflag = lf.bracketflag;
131 braceflag = lf.braceflag; 136 braceflag = lf.braceflag;
132 looping = lf.looping; 137 looping = lf.looping;
133 defining_func = lf.defining_func; 138 defining_func = lf.defining_func;
134 looking_at_function_handle = lf.looking_at_function_handle; 139 looking_at_function_handle = lf.looking_at_function_handle;
203 bool quote_is_transpose; 208 bool quote_is_transpose;
204 209
205 // TRUE means that we have encountered EOF on the input stream. 210 // TRUE means that we have encountered EOF on the input stream.
206 bool parser_end_of_input; 211 bool parser_end_of_input;
207 212
213 // The current input line number.
214 int input_line_number;
215
216 // The column of the current token.
217 int current_input_column;
218
208 // Square bracket level count. 219 // Square bracket level count.
209 int bracketflag; 220 int bracketflag;
210 221
211 // Curly brace level count. 222 // Curly brace level count.
212 int braceflag; 223 int braceflag;