From c65963309bf98d455d525a149259024d24a98f22 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 20 Nov 2011 13:12:48 -0800 Subject: Bug #34630 * parser.y (repeat_clause, rep_elem): Allow empty body. (yybadtoken): Handle unexpected newline with different message. --- ChangeLog | 7 +++++++ parser.y | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce7a90f3..9cf27d2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-11-20 Kaz Kylheku + + Bug #34630 + + * parser.y (repeat_clause, rep_elem): Allow empty body. + (yybadtoken): Handle unexpected newline with different message. + 2011-11-20 Kaz Kylheku Relaxing :vars in collect/coll a little bit. diff --git a/parser.y b/parser.y index 416ab46e..bc6ba4c1 100644 --- a/parser.y +++ b/parser.y @@ -451,7 +451,7 @@ out_clause : repeat_clause { $$ = cons($1, nil); } ; repeat_clause : REPEAT newl - out_clauses + out_clauses_opt repeat_parts_opt END newl { $$ = repeat_rep_helper(repeat_s, $3, $4); rl($$, num($1)); } @@ -508,7 +508,7 @@ o_elem : TEXT { $$ = string_own($1); | rep_elem { $$ = $1; } ; -rep_elem : REP o_elems +rep_elem : REP o_elems_opt rep_parts_opt END { $$ = repeat_rep_helper(rep_s, o_elems_transform($2), $3); @@ -951,6 +951,8 @@ void yybadtoken(int tok, val context) if (context) if (tok == YYEOF || tok == YYEMPTY) yyerrorf(lit("unterminated ~a"), context, nao); + else if (tok == '\n') + yyerrorf(lit("newline in ~a"), context, nao); else yyerrorf(lit("misplaced character ~a in ~a"), chr(tok), context, nao); else -- cgit v1.2.3