diff options
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 60 |
1 files changed, 60 insertions, 0 deletions
@@ -1,5 +1,65 @@ 2014-08-02 Kaz Kylheku <kaz@kylheku.com> + Big switch to reentrant lexing and parsing. + + * parser.l (YY_INPUT): Stop relying on removed yyin_stream; + refer to stream via yyextra. + (yyin_stream, lineno, errors, spec_file_str, + prepared_error_message): Global variables removed. + (yyget_column, yyset_column): Missing prototypes not generated by flex + in bison bridge mode have to be added by us to avoid + warning. + (yyerror): Takes parser and scanner as parameters. Prepared error + message is now in the parser context. Calls to other error handling + functions receive scanner context. + (yyerr): New function. + (yyerrorf, yyerrprepf): Takes scanner argument, chases extra data to + get to parser, and refers to parser variables instead of globals. + (num_esc): Scanner argument added. + (%option reentrant, %option bison-bridge, %option extra-type): New + flex options. + (grammar): yyscanner added everywhere. + (end_of_char): Takes scanner argument. + (parse_init): Removed references to yyin_stream and + prepared_error_message. + (parse_reset): Function renamed to open_txr_file. Returns + results via pointers instead of setting global variables. + (regex_parse, lisp_parse): Use reentrant parser interface. + + * parser.y (yyerror): Prototype removed. + (yylex): Prototype moved after grammar, with new arguments. + (sym_helper, define_transform): Take scanner argument. + (make_expr): Takes parser argument. + (rlrec): New static function. + (rl): Function turned into macro. + (mkexp, symhlpr): New macros. + (%purse-parser, %parse-param, %lex-param): New Yacc options. + (grammar): Actions re-worked for reentrance. Parser and scanner + contexts are passed down to helper functions, in some cases + via the three new macros. The result of the parse is stored + in the syntax_tree member of the parser_t structure instead + of a global. The yylex function receives the scanner instance. + (get_spec): Function removed. + (parse): New function. + + * parser.h (lineno, errors, yyin_stream, spec_file_str): + Declarations removed. + (parser_t): New struct. + (yyerr): New function declared. + (yyparse, yyerror, yyerrorf, end_of_regex, end_of_char, + yylex, yylex_destroy): Declarations updated. + (yylex_init, yyget_extra, yyset_extra): Declared. + (parse_reset, rl): Declaration removed. + (open_txr_file): Declaration added. + (parse): New function. + + * match.c (v_load): Use new reentrant parser interface. + + * txr.c (txr_main): Stop using parser-related global variables; + call parser using new reentrant interface. + +2014-08-02 Kaz Kylheku <kaz@kylheku.com> + * signal.c (interrupt_count): New global variable. (sig_handler): Increment and decrement interrupt count. If the interrupt count is already positive, treat |