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, 6 insertions, 5 deletions

diff --git a/match.c b/match.c
index 26f26a01..230b7be3 100644
--- a/match.c
+++ b/match.c
@@ -4331,18 +4331,19 @@ static val v_load(match_files_ctx *c)
 
     if (!txr_lisp_p) {
       int gc = gc_state(0);
-      parser_t parser;
+      val parser_obj = ensure_parser(stream);
+      parser_t *parser = parser_get_impl(self, parser_obj);
 
-      parse_once(stream, name, &parser);
+      parse_once(self, stream, name);
       gc_state(gc);
 
-      if (parser.errors)
+      if (parser->errors)
         sem_error(specline, lit("~s: errors encountered in ~a"), sym, path, nao);
 
       if (sym == include_s) {
-        ret = parser.syntax_tree;
+        ret = parser->syntax_tree;
       } else {
-        val spec = parser.syntax_tree;
+        val spec = parser->syntax_tree;
         val result = match_files(mf_spec(*c, spec));
 
         if (!result) {