# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1361900595 18000
# Node ID 6884401b2fbbec9a2ffdcb6f446c6b2ea095f949
# Parent  bdf365c5c9bf00ee5058981b3947aeb43193c19a
move reset_parser lexer helper function to lexical_feedback class

* lex.h, lex.ll (reset_parser): Declare as member function of
lexical_feedback class.  Change all uses.
(cleanup_parser): Don't call reset parser.
* parse.h (reset_parser): Delete decl.

diff --git a/libinterp/interpfcn/input.cc b/libinterp/interpfcn/input.cc
--- a/libinterp/interpfcn/input.cc
+++ b/libinterp/interpfcn/input.cc
@@ -686,7 +686,7 @@
     {
       reset_error_handler ();
 
-      reset_parser ();
+      curr_lexer->reset_parser ();
 
       // Save current value of global_command.
       frame.protect_var (global_command);
diff --git a/libinterp/interpfcn/toplev.cc b/libinterp/interpfcn/toplev.cc
--- a/libinterp/interpfcn/toplev.cc
+++ b/libinterp/interpfcn/toplev.cc
@@ -574,7 +574,7 @@
 
           reset_error_handler ();
 
-          reset_parser ();
+          curr_lexer->reset_parser ();
 
           if (symbol_table::at_top_level ())
             tree_evaluator::reset_debug_state ();
diff --git a/libinterp/parse-tree/lex.h b/libinterp/parse-tree/lex.h
--- a/libinterp/parse-tree/lex.h
+++ b/libinterp/parse-tree/lex.h
@@ -205,6 +205,8 @@
     looking_at_object_index.push_front (false);
   }
 
+  void reset_parser (void);
+
   int octave_read (char *buf, unsigned int max_size);
 
   void do_comma_insert_check (void);
diff --git a/libinterp/parse-tree/lex.ll b/libinterp/parse-tree/lex.ll
--- a/libinterp/parse-tree/lex.ll
+++ b/libinterp/parse-tree/lex.ll
@@ -976,12 +976,8 @@
 
 %%
 
-// Fix things up for errors or interrupts.  The parser is never called
-// recursively, so it is always safe to reinitialize its state before
-// doing any parsing.
-
 void
-reset_parser (void)
+lexical_feedback::reset_parser (void)
 {
   // Start off on the right foot.
   BEGIN (INITIAL);
@@ -1209,8 +1205,6 @@
 void
 cleanup_parser (void)
 {
-  reset_parser ();
-
   clear_all_buffers ();
 }
 
diff --git a/libinterp/parse-tree/oct-parse.yy b/libinterp/parse-tree/oct-parse.yy
--- a/libinterp/parse-tree/oct-parse.yy
+++ b/libinterp/parse-tree/oct-parse.yy
@@ -3503,7 +3503,7 @@
       curr_lexer = new lexical_feedback ();
       frame.add_fcn (lexical_feedback::cleanup, curr_lexer);
 
-      reset_parser ();
+      curr_lexer->reset_parser ();
 
       std::string help_txt = gobble_leading_white_space (ffile, eof);
 
@@ -4344,7 +4344,7 @@
 
   do
     {
-      reset_parser ();
+      curr_lexer->reset_parser ();
 
       frame.protect_var (global_command);
 
diff --git a/libinterp/parse-tree/parse.h b/libinterp/parse-tree/parse.h
--- a/libinterp/parse-tree/parse.h
+++ b/libinterp/parse-tree/parse.h
@@ -29,7 +29,6 @@
 
 #include <stack>
 
-extern void reset_parser (void);
 extern int octave_lex (void);
 
 class tree;