From ae618dcca57abb16ad4e5e11083480ecdcfc511f Mon Sep 17 00:00:00 2001
From: "Joel E. Denny" <jdenny@ces.clemson.edu>
Date: Wed, 29 Apr 2009 20:05:32 -0400
Subject: [PATCH] Document how `%define "var" "value"' is not M4-friendly.

* src/parse-gram.y (variable): In comments here.
---
 ChangeLog        |  5 +++++
 src/parse-gram.c | 26 +++++++++++++-------------
 src/parse-gram.y |  2 ++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bbcc426..9c0502c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-24  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+	Document how `%define "var" "value"' is not M4-friendly.
+	* src/parse-gram.y (variable): In comments here.
+
 2009-04-24  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	Add copyright updates missed during previous cherry pick.
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 38e64d61..23f388b7 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -78,8 +78,8 @@
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -672,8 +672,8 @@ static const yytype_uint16 yyrline[] =
      434,   435,   440,   442,   447,   448,   452,   453,   454,   455,
      460,   465,   470,   476,   482,   493,   494,   503,   504,   510,
      511,   512,   519,   519,   523,   524,   525,   530,   531,   533,
-     535,   537,   539,   549,   550,   555,   556,   565,   585,   587,
-     596,   601,   602,   607,   614,   616
+     535,   537,   539,   551,   552,   557,   558,   567,   587,   589,
+     598,   603,   604,   609,   616,   618
 };
 #endif
 
@@ -2544,21 +2544,21 @@ yyreduce:
   case 94:
 
 /* Line 1456 of yacc.c  */
-#line 550 "parse-gram.y"
+#line 552 "parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 95:
 
 /* Line 1456 of yacc.c  */
-#line 555 "parse-gram.y"
+#line 557 "parse-gram.y"
     { (yyval.chars) = ""; }
     break;
 
   case 97:
 
 /* Line 1456 of yacc.c  */
-#line 566 "parse-gram.y"
+#line 568 "parse-gram.y"
     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
@@ -2572,14 +2572,14 @@ yyreduce:
   case 98:
 
 /* Line 1456 of yacc.c  */
-#line 586 "parse-gram.y"
+#line 588 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 99:
 
 /* Line 1456 of yacc.c  */
-#line 588 "parse-gram.y"
+#line 590 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2590,14 +2590,14 @@ yyreduce:
   case 100:
 
 /* Line 1456 of yacc.c  */
-#line 596 "parse-gram.y"
+#line 598 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 103:
 
 /* Line 1456 of yacc.c  */
-#line 608 "parse-gram.y"
+#line 610 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2607,7 +2607,7 @@ yyreduce:
   case 105:
 
 /* Line 1456 of yacc.c  */
-#line 617 "parse-gram.y"
+#line 619 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2840,7 +2840,7 @@ yyreturn:
 
 
 /* Line 1676 of yacc.c  */
-#line 627 "parse-gram.y"
+#line 629 "parse-gram.y"
 
 
 
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 5bf66949..5af473c7 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -545,6 +545,8 @@ rhs:
  | variable and content.opt.  |
  *---------------------------*/
 
+/* The STRING form of variable is deprecated and is not M4-friendly.
+   For example, M4 fails for `%define "[" "value"'.  */
 variable:
   ID
 | STRING { $$ = uniqstr_new ($1); }
-- 
2.47.2