1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add user argument to some macros used by bison

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-05-14 09:28:53 +09:00
parent 3150516aab
commit bdaa491565
Notes: git 2023-05-14 06:39:07 +00:00 
Merged: https://github.com/ruby/ruby/pull/7807
6 changed files with 41 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -919,7 +919,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc
PHONY: PHONY:
{$(VPATH)}parse.c: {$(VPATH)}parse.y $(tooldir)/ytab.sed {$(VPATH)}id.h {$(VPATH)}parse.c: {$(VPATH)}parse.y {$(VPATH)}id.h
{$(VPATH)}parse.h: {$(VPATH)}parse.c {$(VPATH)}parse.h: {$(VPATH)}parse.c
{$(srcdir)}.y.c: {$(srcdir)}.y.c:
@ -927,7 +927,7 @@ PHONY:
$(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) > parse.tmp.y $(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) > parse.tmp.y
$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y $(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
$(Q)$(RM) parse.tmp.y $(Q)$(RM) parse.tmp.y
$(Q)sed -f $(tooldir)/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new $(Q)sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
$(Q)$(MV) $@.new $@ $(Q)$(MV) $@.new $@
$(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h) $(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h)
$(Q)$(RM) y.tab.c y.tab.h $(Q)$(RM) y.tab.c y.tab.h

5
ext/ripper/depend
View File

@ -11,10 +11,7 @@ ripper.o: ripper.c
.y.c: .y.c:
$(ECHO) compiling compiler $< $(ECHO) compiling compiler $<
$(ECHO) $(BISON) $(Q) $(BISON) -t -v -o$@ -h$*.h $<
$(Q) $(BISON) -t -v -oy.tab.c $<
$(Q) sed -e "/^#/s!y\.tab\.c!$@!" -f $(top_srcdir)/tool/ytab.sed y.tab.c > $@
@$(RM) y.tab.c
all: check all: check
static: check static: check

4
parse.y
View File

@ -101,8 +101,8 @@ RBIMPL_WARNING_POP()
#define YYREALLOC(ptr, size) rb_parser_realloc(p, (ptr), (size)) #define YYREALLOC(ptr, size) rb_parser_realloc(p, (ptr), (size))
#define YYCALLOC(nelem, size) rb_parser_calloc(p, (nelem), (size)) #define YYCALLOC(nelem, size) rb_parser_calloc(p, (nelem), (size))
#define YYFREE(ptr) rb_parser_free(p, (ptr)) #define YYFREE(ptr) rb_parser_free(p, (ptr))
#define YYFPRINTF rb_parser_printf #define YYFPRINTF(out, ...) rb_parser_printf(p, __VA_ARGS__)
#define YY_LOCATION_PRINT(File, loc) \ #define YY_LOCATION_PRINT(File, loc, p) \
rb_parser_printf(p, "%d.%d-%d.%d", \ rb_parser_printf(p, "%d.%d-%d.%d", \
(loc).beg_pos.lineno, (loc).beg_pos.column,\ (loc).beg_pos.lineno, (loc).beg_pos.column,\
(loc).end_pos.lineno, (loc).end_pos.column) (loc).end_pos.lineno, (loc).end_pos.column)

68
tool/lrama/template/bison/yacc.c
View File

@ -1,5 +1,5 @@
<%# b4_generated_by -%> <%# b4_generated_by -%>
/* A Bison parser, made by GNU Bison 3.8.2. */ /* A Bison parser, made by Lrama <%= Lrama::VERSION %>. */
<%# b4_copyright -%> <%# b4_copyright -%>
/* Bison implementation for Yacc-like parsers in C /* Bison implementation for Yacc-like parsers in C
@ -114,7 +114,7 @@
#ifndef YYDEBUG #ifndef YYDEBUG
# define YYDEBUG 0 # define YYDEBUG 0
#endif #endif
#if YYDEBUG #if YYDEBUG && !defined(yydebug)
extern int yydebug; extern int yydebug;
#endif #endif
<%-# b4_percent_code_get([[requires]]). %code is not supported -%> <%-# b4_percent_code_get([[requires]]). %code is not supported -%>
@ -731,7 +731,7 @@ do { \
/* Temporary convenience wrapper in case some people defined the /* Temporary convenience wrapper in case some people defined the
undocumented and private YY_LOCATION_PRINT macros. */ undocumented and private YY_LOCATION_PRINT macros. */
# define YYLOCATION_PRINT(File, Loc) YY_LOCATION_PRINT(File, *(Loc)) # define YYLOCATION_PRINT(File, Loc<%= output.user_args %>) YY_LOCATION_PRINT(File, *(Loc)<%= output.user_args %>)
# elif defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # elif defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
@ -767,11 +767,11 @@ yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
/* Temporary convenience wrapper in case some people defined the /* Temporary convenience wrapper in case some people defined the
undocumented and private YY_LOCATION_PRINT macros. */ undocumented and private YY_LOCATION_PRINT macros. */
# define YY_LOCATION_PRINT(File, Loc) YYLOCATION_PRINT(File, &(Loc)) # define YY_LOCATION_PRINT(File, Loc<%= output.user_args %>) YYLOCATION_PRINT(File, &(Loc)<%= output.user_args %>)
# else # else
# define YYLOCATION_PRINT(File, Loc) ((void) 0) # define YYLOCATION_PRINT(File, Loc<%= output.user_args %>) ((void) 0)
/* Temporary convenience wrapper in case some people defined the /* Temporary convenience wrapper in case some people defined the
undocumented and private YY_LOCATION_PRINT macros. */ undocumented and private YY_LOCATION_PRINT macros. */
# define YY_LOCATION_PRINT YYLOCATION_PRINT # define YY_LOCATION_PRINT YYLOCATION_PRINT
@ -780,13 +780,13 @@ yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
# endif /* !defined YYLOCATION_PRINT */ # endif /* !defined YYLOCATION_PRINT */
# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ # define YY_SYMBOL_PRINT(Title, Kind, Value, Location<%= output.user_args %>) \
do { \ do { \
if (yydebug) \ if (yydebug) \
{ \ { \
YYFPRINTF (stderr, "%s ", Title); \ YYFPRINTF (stderr, "%s ", Title); \
yy_symbol_print (stderr, \ yy_symbol_print (stderr, \
Kind, Value, Location, p); \ Kind, Value, Location<%= output.user_args %>); \
YYFPRINTF (stderr, "\n"); \ YYFPRINTF (stderr, "\n"); \
} \ } \
} while (0) } while (0)
@ -828,9 +828,9 @@ yy_symbol_print (FILE *yyo,
YYFPRINTF (yyo, "%s %s (", YYFPRINTF (yyo, "%s %s (",
yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
YYLOCATION_PRINT (yyo, yylocationp); YYLOCATION_PRINT (yyo, yylocationp<%= output.user_args %>);
YYFPRINTF (yyo, ": "); YYFPRINTF (yyo, ": ");
yy_symbol_value_print (yyo, yykind, yyvaluep, yylocationp, p); yy_symbol_value_print (yyo, yykind, yyvaluep, yylocationp<%= output.user_args %>);
YYFPRINTF (yyo, ")"); YYFPRINTF (yyo, ")");
} }
@ -840,7 +840,7 @@ yy_symbol_print (FILE *yyo,
`------------------------------------------------------------------*/ `------------------------------------------------------------------*/
static void static void
yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop<%= output.user_formals %>)
{ {
YYFPRINTF (stderr, "Stack now"); YYFPRINTF (stderr, "Stack now");
for (; yybottom <= yytop; yybottom++) for (; yybottom <= yytop; yybottom++)
@ -851,10 +851,10 @@ yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
YYFPRINTF (stderr, "\n"); YYFPRINTF (stderr, "\n");
} }
# define YY_STACK_PRINT(Bottom, Top) \ # define YY_STACK_PRINT(Bottom, Top<%= output.user_args %>) \
do { \ do { \
if (yydebug) \ if (yydebug) \
yy_stack_print ((Bottom), (Top)); \ yy_stack_print ((Bottom), (Top)<%= output.user_args %>); \
} while (0) } while (0)
@ -878,25 +878,27 @@ yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp,
yy_symbol_print (stderr, yy_symbol_print (stderr,
YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]),
&yyvsp[(yyi + 1) - (yynrhs)], &yyvsp[(yyi + 1) - (yynrhs)],
&(yylsp[(yyi + 1) - (yynrhs)]), p); &(yylsp[(yyi + 1) - (yynrhs)])<%= output.user_args %>);
YYFPRINTF (stderr, "\n"); YYFPRINTF (stderr, "\n");
} }
} }
# define YY_REDUCE_PRINT(Rule) \ # define YY_REDUCE_PRINT(Rule<%= output.user_args %>) \
do { \ do { \
if (yydebug) \ if (yydebug) \
yy_reduce_print (yyssp, yyvsp, yylsp, Rule, p); \ yy_reduce_print (yyssp, yyvsp, yylsp, Rule<%= output.user_args %>); \
} while (0) } while (0)
/* Nonzero means print parse trace. It is left uninitialized so that /* Nonzero means print parse trace. It is left uninitialized so that
multiple parsers can coexist. */ multiple parsers can coexist. */
#ifndef yydebug
int yydebug; int yydebug;
#endif
#else /* !YYDEBUG */ #else /* !YYDEBUG */
# define YYDPRINTF(Args) ((void) 0) # define YYDPRINTF(Args) ((void) 0)
# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_SYMBOL_PRINT(Title, Kind, Value, Location<%= output.user_args %>)
# define YY_STACK_PRINT(Bottom, Top) # define YY_STACK_PRINT(Bottom, Top<%= output.user_args %>)
# define YY_REDUCE_PRINT(Rule) # define YY_REDUCE_PRINT(Rule<%= output.user_args %>)
#endif /* !YYDEBUG */ #endif /* !YYDEBUG */
@ -1110,7 +1112,7 @@ yy_syntax_error_arguments (const yypcontext_t *yyctx,
required number of bytes is too large to store. */ required number of bytes is too large to store. */
static int static int
yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
const yypcontext_t *yyctx) const yypcontext_t *yyctx<%= output.user_formals %>)
{ {
enum { YYARGS_MAX = 5 }; enum { YYARGS_MAX = 5 };
/* Internationalized format string. */ /* Internationalized format string. */
@ -1200,7 +1202,7 @@ yydestruct (const char *yymsg,
<%= output.parse_param_use("yyvaluep", "yylocationp") %> <%= output.parse_param_use("yyvaluep", "yylocationp") %>
if (!yymsg) if (!yymsg)
yymsg = "Deleting"; yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp<%= output.user_args %>);
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YY_USE (yykind); YY_USE (yykind);
@ -1227,11 +1229,11 @@ int yychar;
/* The semantic value of the lookahead symbol. */ /* The semantic value of the lookahead symbol. */
/* Default value used for initialization, for pacifying older GCCs /* Default value used for initialization, for pacifying older GCCs
or non-GCC compilers. */ or non-GCC compilers. */
YY_INITIAL_VALUE (static YYSTYPE yyval_default;) YY_INITIAL_VALUE (static const YYSTYPE yyval_default;)
YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
/* Location data for the lookahead symbol. */ /* Location data for the lookahead symbol. */
static YYLTYPE yyloc_default static const YYLTYPE yyloc_default
# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
= { 1, 1, 1, 1 } = { 1, 1, 1, 1 }
# endif # endif
@ -1322,7 +1324,7 @@ yysetstate:
YY_IGNORE_USELESS_CAST_BEGIN YY_IGNORE_USELESS_CAST_BEGIN
*yyssp = YY_CAST (yy_state_t, yystate); *yyssp = YY_CAST (yy_state_t, yystate);
YY_IGNORE_USELESS_CAST_END YY_IGNORE_USELESS_CAST_END
YY_STACK_PRINT (yyss, yyssp); YY_STACK_PRINT (yyss, yyssp<%= output.user_args %>);
if (yyss + yystacksize - 1 <= yyssp) if (yyss + yystacksize - 1 <= yyssp)
#if !defined yyoverflow && !defined YYSTACK_RELOCATE #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@ -1440,7 +1442,7 @@ yybackup:
else else
{ {
yytoken = YYTRANSLATE (yychar); yytoken = YYTRANSLATE (yychar);
YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc<%= output.user_args %>);
} }
/* If the proper action on seeing token YYTOKEN is to reduce or to /* If the proper action on seeing token YYTOKEN is to reduce or to
@ -1463,7 +1465,7 @@ yybackup:
yyerrstatus--; yyerrstatus--;
/* Shift the lookahead token. */ /* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc<%= output.user_args %>);
yystate = yyn; yystate = yyn;
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval; *++yyvsp = yylval;
@ -1505,7 +1507,7 @@ yyreduce:
/* Default location. */ /* Default location. */
YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
yyerror_range[1] = yyloc; yyerror_range[1] = yyloc;
YY_REDUCE_PRINT (yyn); YY_REDUCE_PRINT (yyn<%= output.user_args %>);
switch (yyn) switch (yyn)
{ {
<%= output.user_actions -%> <%= output.user_actions -%>
@ -1523,7 +1525,7 @@ yyreduce:
case of YYERROR or YYBACKUP, subsequent parser actions might lead case of YYERROR or YYBACKUP, subsequent parser actions might lead
to an incorrect destructor call or verbose syntax error message to an incorrect destructor call or verbose syntax error message
before the lookahead is translated. */ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc<%= output.user_args %>);
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
yylen = 0; yylen = 0;
@ -1561,7 +1563,7 @@ yyerrlab:
= {yyssp, yytoken, &yylloc}; = {yyssp, yytoken, &yylloc};
char const *yymsgp = YY_("syntax error"); char const *yymsgp = YY_("syntax error");
int yysyntax_error_status; int yysyntax_error_status;
yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx<%= output.user_args %>);
if (yysyntax_error_status == 0) if (yysyntax_error_status == 0)
yymsgp = yymsg; yymsgp = yymsg;
else if (yysyntax_error_status == -1) else if (yysyntax_error_status == -1)
@ -1573,7 +1575,7 @@ yyerrlab:
if (yymsg) if (yymsg)
{ {
yysyntax_error_status yysyntax_error_status
= yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx<%= output.user_args %>);
yymsgp = yymsg; yymsgp = yymsg;
} }
else else
@ -1628,7 +1630,7 @@ yyerrorlab:
this YYERROR. */ this YYERROR. */
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
yylen = 0; yylen = 0;
YY_STACK_PRINT (yyss, yyssp); YY_STACK_PRINT (yyss, yyssp<%= output.user_args %>);
yystate = *yyssp; yystate = *yyssp;
goto yyerrlab1; goto yyerrlab1;
@ -1663,7 +1665,7 @@ yyerrlab1:
YY_ACCESSING_SYMBOL (yystate), yyvsp, yylsp<%= output.user_args %>); YY_ACCESSING_SYMBOL (yystate), yyvsp, yylsp<%= output.user_args %>);
YYPOPSTACK (1); YYPOPSTACK (1);
yystate = *yyssp; yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp); YY_STACK_PRINT (yyss, yyssp<%= output.user_args %>);
} }
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
@ -1675,7 +1677,7 @@ yyerrlab1:
YYLLOC_DEFAULT (*yylsp, yyerror_range, 2); YYLLOC_DEFAULT (*yylsp, yyerror_range, 2);
/* Shift the error token. */ /* Shift the error token. */
YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp<%= output.user_args %>);
yystate = yyn; yystate = yyn;
goto yynewstate; goto yynewstate;
@ -1721,7 +1723,7 @@ yyreturnlab:
/* Do not reclaim the symbols of the rule whose action triggered /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */ this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
YY_STACK_PRINT (yyss, yyssp); YY_STACK_PRINT (yyss, yyssp<%= output.user_args %>);
while (yyssp != yyss) while (yyssp != yyss)
{ {
yydestruct ("Cleanup: popping", yydestruct ("Cleanup: popping",

2
tool/lrama/template/bison/yacc.h
View File

@ -1,5 +1,5 @@
<%# b4_generated_by -%> <%# b4_generated_by -%>
/* A Bison parser, made by GNU Bison 3.8.2. */ /* A Bison parser, made by Lrama <%= Lrama::VERSION %>. */
<%# b4_copyright -%> <%# b4_copyright -%>
/* Bison interface for Yacc-like parsers in C /* Bison interface for Yacc-like parsers in C

82
tool/ytab.sed
View File

@ -1,82 +0,0 @@
#!/bin/sed -f
# This file is used when generating code for the Ruby parser.
/^int yydebug;/{
i\
#ifndef yydebug
a\
#endif
}
/^extern int yydebug;/{
i\
#ifndef yydebug
a\
#endif
}
/^yydestruct.*yymsg/,/{/{
/^yydestruct/{
/,$/N
/[, *]p)/!{
H
s/^/ruby_parser_&/
s/)$/, p)/
/\*/s/p)$/struct parser_params *&/
}
}
/^#endif/{
x
/yydestruct/{
i\
\ struct parser_params *p;
}
x
}
/^{/{
x
/yydestruct/{
i\
#define yydestruct(m, t, v) ruby_parser_yydestruct(m, t, v, p)
}
x
}
}
/^yy_stack_print /,/{/{
/^yy_stack_print/{
/[, *]p)/!{
H
s/^/ruby_parser_&/
s/)$/, p)/
/\*/s/p)$/struct parser_params *&/
}
}
/^#endif/{
x
/yy_stack_print/{
i\
\ struct parser_params *p;
}
x
}
/^{/{
x
/yy_stack_print/{
i\
#define yy_stack_print(b, t) ruby_parser_yy_stack_print(b, t, p)
}
x
}
}
/^yy_reduce_print/,/^}/{
s/fprintf *(stderr,/YYFPRINTF (p,/g
}
s/^yysyntax_error (/&struct parser_params *p, /
s/ yysyntax_error (/&p, /
s/\( YYFPRINTF *(\)yyoutput,/\1p,/
s/\( YYFPRINTF *(\)yyo,/\1p,/
s/\( YYFPRINTF *(\)stderr,/\1p,/
s/\( YYDPRINTF *((\)stderr,/\1p,/
s/^\([ ]*\)\(yyerror[ ]*([ ]*parser,\)/\1parser_\2/
s/\(static\)\( YYSTYPE yyval_default\)/\1 const\2/
s/\(static\)\( YYLTYPE yyloc_default\)/\1 const\2/
s!^ *extern char \*getenv();!/* & */!
s/^\(#.*\)".*\.tab\.c"/\1"parse.c"/
/^\(#.*\)".*\.y"/s:\\\\:/:g