Hack to fix $$ from yyval to yylval, @$ from yyloc to yylloc in initial action

diff --git a/bison_lr1dfa.py b/bison_lr1dfa.py
index f52421a..9a44900 100644 (file)
--- a/bison_lr1dfa.py
+++ b/bison_lr1dfa.py
@@ -939,7 +939,7 @@ static const yytype_int16 yyr2[] =
                     '{0:s}\n'.format(i.get_text())
                     for i in pyacc.initial_action_code
                   ]
-                )
+                ).replace('(yyval)', '(yylval').replace('(yyloc)', '(yylloc)') # hack
               )
             )
           elif line == '/* GENERATE SECTION2 */\n':

diff --git a/skel/y.tab.c.patch b/skel/y.tab.c.patch
index 002b101..6556fed 100644 (file)
--- a/skel/y.tab.c.patch
+++ b/skel/y.tab.c.patch
@@ -1,5 +1,5 @@
 --- y.tab.c.orig       2018-07-30 07:49:37.272876744 +1000
-+++ y.tab.c    2018-07-30 08:33:25.532946107 +1000
++++ y.tab.c    2018-07-30 10:36:37.807262919 +1000
 @@ -50,7 +50,7 @@
  #define YYSKELETON_NAME "yacc.c"
  
@@ -702,7 +702,7 @@
 +
 +/* User initialization code.  */
 +/* GENERATE INITIALACTION */
-+
++  yyvsp[0] = yylval;
 +#if defined YYLTYPE || defined YYLTYPE_IS_DECLARED
 +  yylsp[0] = yylloc;
 +#endif