From 8200219a2a98c54a72cd744abbb656e18bd33ccf Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 11 Dec 2008 00:59:13 +0100 Subject: [PATCH] Simplify the i18n of the error messages. * data/lalr1.cc: Comment changes. (cherry picked from commit eeb29422377c730846f784716f22be1759491bcf) Conflicts: data/yacc.c --- ChangeLog | 5 +++++ data/lalr1.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 97e3e9b9..28b33a16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-11 Akim Demaille + + Simplify the i18n of the error messages. + * data/lalr1.cc: Comment changes. + 2008-11-11 Akim Demaille Prefer M4 to CPP. diff --git a/data/lalr1.cc b/data/lalr1.cc index e7620a23..a3f7567a 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -862,7 +862,8 @@ b4_error_verbose_if([int yystate, int yytoken], int yychecklim = yylast_ - yyn + 1; int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_; - // Number of "expected" tokens. + // Number of reported tokens (one for the "unexpected", one per + // "expected"). size_t yycount = 0; // Its maximum. enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; -- 2.45.2