Bugfix: lexer loses unmatched "hold char" between top-level forms.

Test case: file containing 4(prinl 3). Scanner consumes 4 and (.
The ( is lost when the scanner is reset for the next call to yyparse,
resulting in jut prinl being read and interpreted as a variable.

* parser.c (prime_parser): If present, append hold byte to priming
string. Takes parser_t * instead of parser, and returns void now.

* parser.l (reset_scanner): Now returns int value, the value
of the scanner's yy_hold_char variable which is nonzero when
the scanner is hanging on to an unmatched byte of input.

* parser.h (reset_scanner, prime_parser): Declarations updated.

* parser.y (parse): Pass hold byte returned by reset_scanner to
prime_parser.

1 files changed, 2 insertions, 2 deletions

diff --git a/parser.h b/parser.h
index 0db10d4e..83bd7c38 100644
--- a/parser.h
+++ b/parser.h
@@ -53,14 +53,14 @@ void yyerrorf(scanner_t *scanner, val s, ...);
 void yybadtoken(parser_t *, int tok, val context);
 void end_of_regex(scanner_t *scanner);
 void end_of_char(scanner_t *scanner);
-void reset_scanner(scanner_t *scanner);
+int reset_scanner(scanner_t *scanner);
 int yylex_init(yyscan_t *pscanner);
 int yylex_destroy(yyscan_t scanner);
 parser_t *yyget_extra(yyscan_t scanner);
 void yyset_extra(parser_t *, yyscan_t);
 void parser_l_init(void);
 void open_txr_file(val spec_file, val *txr_lisp_p, val *name, val *stream);
-val prime_parser(val parser);
+void prime_parser(parser_t *, int hold_byte);
 int parse_once(val stream, val name, parser_t *parser);
 int parse(parser_t *parser);
 val source_loc(val form);