Simplify the i18n of the error messages.

	* data/lalr1.cc: Comment changes.
(cherry picked from commit eeb29422377c730846f784716f22be1759491bcf)

Conflicts:

	data/yacc.c

diff --git a/ChangeLog b/ChangeLog
index 97e3e9b90fa6b41316c7dc313c44315e0807f60f..28b33a1604eaca569e9c9976d3edb07517cc66be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-11  Akim Demaille  <demaille@gostai.com>
+
+       Simplify the i18n of the error messages.
+       * data/lalr1.cc: Comment changes.
+

 2008-11-11  Akim Demaille  <demaille@gostai.com>
 
        Prefer M4 to CPP.
 2008-11-11  Akim Demaille  <demaille@gostai.com>
 
        Prefer M4 to CPP.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index e7620a2307daa9452f2f7eeff34e15ad30db1793..a3f7567ac4cc0a46bea1650189f0900c6825c4a8 100644 (file)
--- 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_;
 
        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 };
        size_t yycount = 0;
         // Its maximum.
         enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };