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, 1 deletions

diff --git a/parser.h b/parser.h
index 246832ab..ec694bbb 100644
--- a/parser.h
+++ b/parser.h
@@ -102,7 +102,7 @@ void parser_resolve_circ(parser_t *);
 void parser_circ_def(parser_t *, val num, val expr);
 val parser_circ_ref(parser_t *, val num);
 void scrub_scanner(scanner_t *, int yy_char, wchar_t *lexeme);
-int parse_once(val stream, val name, parser_t *parser);
+int parse_once(val self, val stream, val name);
 int parse(parser_t *parser, val name, enum prime_parser);
 val source_loc(val form);
 val source_loc_str(val form, val alt);
@@ -129,7 +129,9 @@ val repl(val bindings, val in_stream, val out_stream, val env);
 void parser_common_init(parser_t *);
 void parser_cleanup(parser_t *);
 val parser(val stream, val lineno);
+parser_t *parser_get_impl(val self, val parser);
 val get_parser(val stream);
+val ensure_parser(val stream);
 val parser_errors(val parser);
 val parser_eof(val parser);
 void parse_init(void);