Mercurial > hg > octave-lyh

comparison libinterp/parse-tree/parse.h @ 16288:fe3b9a51e625

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename curr_lexer, curr_parser, CURR_LEXER * input.cc, toplev.cc, oct-parse.in.yy, parse.h: Drop curr_ prefix from curr_lexer, curr_parser, and CURR_PARSER variables.
author John W. Eaton <jwe@octave.org>
date Tue, 12 Mar 2013 00:24:54 -0400
parents 04a7953496a7
children bde729ba8381 57e87ddfee14
comparison
equal deleted inserted replaced
16287:04a7953496a7 16288:fe3b9a51e625
121 121
122 extern OCTINTERP_API void cleanup_statement_list (tree_statement_list **lst); 122 extern OCTINTERP_API void cleanup_statement_list (tree_statement_list **lst);
123 123
124 // Global access to currently active lexer. 124 // Global access to currently active lexer.
125 // FIXME -- to be removed after more parser+lexer refactoring. 125 // FIXME -- to be removed after more parser+lexer refactoring.
126 extern octave_lexer *CURR_LEXER; 126 extern octave_lexer *LEXER;
127 127
128 class 128 class
129 octave_base_parser 129 octave_base_parser
130 { 130 {
131 public: 131 public:
135 autoloading (false), fcn_file_from_relative_lookup (false), 135 autoloading (false), fcn_file_from_relative_lookup (false),
136 parsing_subfunctions (false), max_fcn_depth (0), 136 parsing_subfunctions (false), max_fcn_depth (0),
137 curr_fcn_depth (0), primary_fcn_scope (-1), 137 curr_fcn_depth (0), primary_fcn_scope (-1),
138 curr_class_name (), function_scopes (), primary_fcn_ptr (0), 138 curr_class_name (), function_scopes (), primary_fcn_ptr (0),
139 stmt_list (0), 139 stmt_list (0),
140 curr_lexer (lxr), parser_state (0) 140 lexer (lxr), parser_state (0)
141 { 141 {
142 init (); 142 init ();
143 } 143 }
144 144
145 virtual ~octave_base_parser (void); 145 virtual ~octave_base_parser (void);
379 379
380 // Result of parsing input. 380 // Result of parsing input.
381 tree_statement_list *stmt_list; 381 tree_statement_list *stmt_list;
382 382
383 // State of the lexer. 383 // State of the lexer.
384 octave_lexer& curr_lexer; 384 octave_lexer& lexer;
385 385
386 // Internal state of the parser. Only used if USE_PUSH_PARSER is 386 // Internal state of the parser. Only used if USE_PUSH_PARSER is
387 // defined. 387 // defined.
388 void *parser_state; 388 void *parser_state;
389 389