mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
more ytab.sed fixes
* tool/ytab.sed: fix for more old bison which does not support %lex-param at yydestruct (missed at the previous commit). define yy_stack_print macro to add `p` argument instead of replacement at callers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8f745a2fab
commit
65236c069e
1 changed files with 16 additions and 10 deletions
|
@ -12,13 +12,13 @@ i\
|
|||
a\
|
||||
#endif
|
||||
}
|
||||
/^yydestruct.*yymsg/,/#endif/{
|
||||
/^yydestruct.*yymsg/,/{/{
|
||||
/^yydestruct/{
|
||||
/[, *]p)/!{
|
||||
H
|
||||
s/^/ruby_parser_&/
|
||||
s/)$/, p)/
|
||||
/\*/s/parser)$/struct parser_params *&/
|
||||
/\*/s/p)$/struct parser_params *&/
|
||||
}
|
||||
}
|
||||
/^#endif/{
|
||||
|
@ -26,16 +26,23 @@ a\
|
|||
/yydestruct/{
|
||||
i\
|
||||
\ struct parser_params *p;
|
||||
a\
|
||||
}
|
||||
x
|
||||
}
|
||||
/^{/{
|
||||
x
|
||||
/yydestruct/{
|
||||
i\
|
||||
#define yydestruct(m, t, v) ruby_parser_yydestruct(m, t, v, p)
|
||||
}
|
||||
x
|
||||
}
|
||||
}
|
||||
/^yy_stack_print /,/#endif/{
|
||||
/^yy_stack_print /,/{/{
|
||||
/^yy_stack_print/{
|
||||
/[, *]p)/!{
|
||||
H
|
||||
s/^/ruby_parser_&/
|
||||
s/)$/, p)/
|
||||
/\*/s/p)$/struct parser_params *&/
|
||||
}
|
||||
|
@ -48,15 +55,14 @@ a\
|
|||
}
|
||||
x
|
||||
}
|
||||
}
|
||||
/yy_stack_print.*;/{
|
||||
x
|
||||
/yy_stack_print/{
|
||||
/^{/{
|
||||
x
|
||||
s/\(yy_stack_print *\)(\(.*\));/\1(\2, p);/
|
||||
/yy_stack_print/{
|
||||
i\
|
||||
#define yy_stack_print(b, t) ruby_parser_yy_stack_print(b, t, p)
|
||||
}
|
||||
x
|
||||
}
|
||||
x
|
||||
}
|
||||
/^yy_reduce_print/,/^}/{
|
||||
s/fprintf *(stderr,/YYFPRINTF (p,/g
|
||||
|
|
Loading…
Reference in a new issue