parser: always use stream-associated parser for parse_once.

This refactoring is needed for fixing the off-by-one
line number bug when the hash bang line is processed.

* eval.c (load): Don't define parser locally; ensure there is
one in the stream and use it.

* match.c (v_load): Likewise.

* parser.c (get_parser_impl): Renamed to parser_get_impl and
changed from internal to external linkage.
(ensure_parser): Changed to external linkage.
(lisp_parser_impl, read_file_common): Follow rename of
get_parser_impl.

* parser.h (parse_once): Declaration updated.
(parser_get_impl, ensure_parser): Declared.

* parser.y (parse_once): Take self parameter; drop parser
parameter. Ensure a parser to the stream, rather than
declaring one locally. Don't clean up the parser when
done, just let the stream clean it up.

* txr.c (parse_once_noerr): Parser argument is dropped and
not passed to parse_once. Program name is passed as self
argument to parse_once.
(txr_main): When parsing the TXR pattern query, don't define a
parser locally; ensure there is one in the stream and use it,
like in load and v_load.

1 files changed, 3 insertions, 6 deletions

diff --git a/parser.y b/parser.y
index f70693c5..e878d636 100644
--- a/parser.y
+++ b/parser.y
@@ -1847,16 +1847,14 @@ void yybadtoken(parser_t *parser, int tok, val context)
         yyerrorf(scnr, lit("unexpected character ~a"), chr(tok), nao);
 }
 
-int parse_once(val stream, val name, parser_t *parser)
+int parse_once(val self, val stream, val name)
 {
   int res = 0;
 #if CONFIG_DEBUG_SUPPORT
   unsigned dbg_state = debug_clear(opt_dbg_expansion ? 0 : DBG_ENABLE);
 #endif
-  parser_common_init(parser);
-
-  parser->stream = stream;
-  parser->name = name;
+  val parser_obj = ensure_parser(stream);
+  parser_t *parser = parser_get_impl(self, parser_obj);
   parser->rec_source_loc = 1;
 
   uw_catch_begin(cons(error_s, nil), esym, eobj);
@@ -1872,7 +1870,6 @@ int parse_once(val stream, val name, parser_t *parser)
   }
 
   uw_unwind {
-    parser_cleanup(parser);
 #if CONFIG_DEBUG_SUPPORT
     debug_set(dbg_state);
 #endif