more ytab.sed fixes

* tool/ytab.sed: `p` is too short to distinguish alone from other
  names.  fix for more old bison which does not support %lex-param
  at yydestruct.  add `p` argument to non-prototype declaration of
  yy_stack_print.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 17 insertions, 7 deletions

diff --git a/tool/ytab.sed b/tool/ytab.sed
index f232daf5aa..75a8785b60 100755
--- a/tool/ytab.sed
+++ b/tool/ytab.sed
@@ -14,7 +14,7 @@ a\
 }
 /^yydestruct.*yymsg/,/#endif/{
   /^yydestruct/{
-    /p/!{
+    /[, *]p)/!{
       H
       s/^/ruby_parser_&/
       s/)$/, p)/
@@ -25,18 +25,28 @@ a\
     x
     /yydestruct/{
       i\
-    struct parser_params *p;
+\    struct parser_params *p;
       a\
 #define yydestruct(m, t, v) ruby_parser_yydestruct(m, t, v, p)
     }
     x
   }
 }
-/^yy_stack_print/{
-  /parser/!{
-    H
-    s/)$/, p)/
-    /\*/s/p)$/struct parser_params *&/
+/^yy_stack_print /,/#endif/{
+  /^yy_stack_print/{
+    /[, *]p)/!{
+      H
+      s/)$/, p)/
+      /\*/s/p)$/struct parser_params *&/
+    }
+  }
+  /^#endif/{
+    x
+    /yy_stack_print/{
+      i\
+\    struct parser_params *p;
+    }
+    x
   }
 }
 /yy_stack_print.*;/{