* src/conflicts.c (log_resolution): Argument `resolution' is const.

diff --git a/ChangeLog b/ChangeLog
index 3537652a28f9bf4596f1737e95c4ed1051ebd852..e58db5e54baf95146373df55c4c24e9d4a1d2e2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (log_resolution): Argument `resolution' is const.
+

 2002-03-19  Paul Eggert  <eggert@twinsun.com>
 
        * src/bison.simple (YYCOPY): New macro.
 2002-03-19  Paul Eggert  <eggert@twinsun.com>
 
        * src/bison.simple (YYCOPY): New macro.


@@ -19,7 +23,7 @@
        * src/reader.c (parse_union_decl): Define the muscle stype_line.
        * data/bison.simple, data/bison.c++: Use it.
 
        * src/reader.c (parse_union_decl): Define the muscle stype_line.
        * data/bison.simple, data/bison.c++: Use it.
 

-       
+

 2002-03-19  Akim Demaille  <akim@epita.fr>
 
        * tests/regression.at (%nonassoc and eof, Unresolved SR Conflicts)
 2002-03-19  Akim Demaille  <akim@epita.fr>
 
        * tests/regression.at (%nonassoc and eof, Unresolved SR Conflicts)

diff --git a/data/bison.c++ b/data/bison.c++
index 87303be90c2c1d8986725a78192e8179226d907d..7537a6cd9a5c099cd00fb664096df56c0e912380 100644 (file)
--- a/data/bison.c++
+++ b/data/bison.c++
@@ -96,7 +96,7 @@ b4_copyright
 b4_prologue
 
 /* Tokens.  */
 b4_prologue
 
 /* Tokens.  */

-b4_token_defines
+b4_token_defines(b4_tokens)

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

diff --git a/src/conflicts.c b/src/conflicts.c
index d90b380aa4ef87b5fb8b1cdc6f3d5157b81a4e4b..50669cbf1d3c3108a880d0cf25ec92dd40a4a86b 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -40,7 +40,7 @@ static bitset lookaheadset;
 \f
 
 static inline void
 \f
 
 static inline void

-log_resolution (state_t *state, int LAno, int token, char *resolution)
+log_resolution (state_t *state, int LAno, int token, const char *resolution)

 {
   if (verbose_flag)
     obstack_fgrow4 (&output_obstack,
 {
   if (verbose_flag)
     obstack_fgrow4 (&output_obstack,