Mercurial > hg > octave-lyh

diff 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
line wrap: on
line diff
--- a/libinterp/parse-tree/parse.h
+++ b/libinterp/parse-tree/parse.h
@@ -123,7 +123,7 @@
 
 // Global access to currently active lexer.
 // FIXME -- to be removed after more parser+lexer refactoring.
-extern octave_lexer *CURR_LEXER;
+extern octave_lexer *LEXER;
 
 class
 octave_base_parser
@@ -137,7 +137,7 @@
       curr_fcn_depth (0), primary_fcn_scope (-1),
       curr_class_name (), function_scopes (), primary_fcn_ptr (0),
       stmt_list (0),
-      curr_lexer (lxr), parser_state (0)
+      lexer (lxr), parser_state (0)
   {
     init ();
   }
@@ -381,7 +381,7 @@
   tree_statement_list *stmt_list;
 
   // State of the lexer.
-  octave_lexer& curr_lexer;
+  octave_lexer& lexer;
 
   // Internal state of the parser.  Only used if USE_PUSH_PARSER is
   // defined.