Skip to content

[pull] master from ruby:master #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Mar 1, 2026
+104 −132
Merged

[pull] master from ruby:master #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
851a10b
Revert "parse.y: narrow excessed_comma to block_param_def"
nobu Feb 28, 2026
504cf45
parse.y: Extract f_empty_arg
nobu Mar 1, 2026
0980de4
parse.y: Extract new_empty_args_tail macro
nobu Mar 1, 2026
45dce19
parse.y: Parameterize argument list rules
nobu Mar 1, 2026
d68e4be
lrama pre-0.8.0
nobu Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 51 additions & 101 deletions parse.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,6 +1431,7 @@ static NODE *method_add_block(struct parser_params*p, NODE *m, NODE *b, const YY
static bool args_info_empty_p(struct rb_args_info *args);
static rb_node_args_t *new_args(struct parser_params*,rb_node_args_aux_t*,rb_node_opt_arg_t*,ID,rb_node_args_aux_t*,rb_node_args_t*,const YYLTYPE*);
static rb_node_args_t *new_args_tail(struct parser_params*,rb_node_kw_arg_t*,ID,ID,const YYLTYPE*);
#define new_empty_args_tail(p, loc) new_args_tail(p, 0, 0, 0, loc)
static NODE *new_array_pattern(struct parser_params *p, NODE *constant, NODE *pre_arg, NODE *aryptn, const YYLTYPE *loc);
static NODE *new_array_pattern_tail(struct parser_params *p, NODE *pre_args, int has_rest, NODE *rest_arg, NODE *post_args, const YYLTYPE *loc);
static NODE *new_find_pattern(struct parser_params *p, NODE *constant, NODE *fndptn, const YYLTYPE *loc);
Expand Down Expand Up @@ -2772,13 +2773,13 @@ rb_parser_ary_free(rb_parser_t *p, rb_parser_ary_t *ary)
%type <node> if_tail opt_else case_body case_args cases opt_rescue exc_list exc_var opt_ensure
%type <node> args arg_splat call_args opt_call_args
%type <node> paren_args opt_paren_args
%type <node_args> args_tail block_args_tail
%type <node_args> args_tail block_args_tail f_args-opt_tail block_args-opt_tail
%type <node> command_args aref_args
%type <node_block_pass> opt_block_arg block_arg
%type <node> var_ref var_lhs
%type <node> command_rhs arg_rhs
%type <node> command_asgn mrhs mrhs_arg superclass block_call block_command
%type <node_args> f_arglist f_opt_paren_args f_paren_args f_args
%type <node_args> f_arglist f_opt_paren_args f_paren_args f_args f_empty_arg
%type <node_args_aux> f_arg f_arg_item
%type <node> f_marg f_rest_marg
%type <node_masgn> f_margs
Expand Down Expand Up @@ -3094,7 +3095,7 @@ rb_parser_ary_free(rb_parser_t *p, rb_parser_ary_t *ary)
}
| /* none */
{
$$ = new_args_tail(p, 0, 0, 0, &@$);
$$ = new_empty_args_tail(p, &@$);
/*% ripper: [Qnil, Qnil, Qnil] %*/
}
;
Expand Down Expand Up @@ -4577,7 +4578,7 @@ primary : inline_primary
m->nd_next = node_assign(p, (NODE *)NEW_MASGN(NEW_LIST($for_var, &@for_var), 0, &@for_var), internal_var, NO_LEX_CTXT, &@for_var);
}
/* {|*internal_id| <m> = internal_id; ... } */
args = new_args(p, m, 0, id, 0, new_args_tail(p, 0, 0, 0, &@for_var), &@for_var);
args = new_args(p, m, 0, id, 0, new_empty_args_tail(p, &@for_var), &@for_var);
scope = NEW_SCOPE2(tbl, args, $compstmt, NULL, &@$);
YYLTYPE do_keyword_loc = $do == keyword_do_cond ? @do : NULL_LOC;
$$ = NEW_FOR($expr_value, scope, &@$, &@k_for, &@keyword_in, &do_keyword_loc, &@k_end);
Expand Down Expand Up @@ -4975,6 +4976,9 @@ f_eq : {p->ctxt.in_argdef = 0;} '=';
block_args_tail : args_tail_basic(primary_value)
;

block_args-opt_tail : opt_args_tail(block_args_tail)
;

excessed_comma : ','
{
/* magic number for rest_id in iseq_set_arguments() */
Expand All @@ -4983,76 +4987,19 @@ excessed_comma : ','
}
;

block_param : f_arg[pre] ',' f_opt_arg(primary_value)[opt] ',' f_rest_arg[rest] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, $pre, $opt, $rest, 0, $tail, &@$);
/*% ripper: params!($:pre, $:opt, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_opt_arg(primary_value)[opt] ',' f_rest_arg[rest] ',' f_arg[post] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, $pre, $opt, $rest, $post, $tail, &@$);
/*% ripper: params!($:pre, $:opt, $:rest, $:post, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_opt_arg(primary_value)[opt] opt_args_tail(block_args_tail)[tail]
block_param : args-list(primary_value, block_args-opt_tail)
| f_arg[pre] excessed_comma
{
$$ = new_args(p, $pre, $opt, 0, 0, $tail, &@$);
/*% ripper: params!($:pre, $:opt, Qnil, Qnil, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_opt_arg(primary_value)[opt] ',' f_arg[post] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, $pre, $opt, 0, $post, $tail, &@$);
/*% ripper: params!($:pre, $:opt, Qnil, $:post, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_rest_arg[rest] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, $pre, 0, $rest, 0, $tail, &@$);
/*% ripper: params!($:pre, Qnil, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_rest_arg[rest] ',' f_arg[post] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, $pre, 0, $rest, $post, $tail, &@$);
/*% ripper: params!($:pre, Qnil, $:rest, $:post, *$:tail[0..2]) %*/
$$ = new_empty_args_tail(p, &@excessed_comma);
$$ = new_args(p, $pre, 0, $excessed_comma, 0, $$, &@$);
/*% ripper: params!($:pre, Qnil, $:excessed_comma, Qnil, Qnil, Qnil, Qnil) %*/
}
| f_arg[pre] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, $pre, 0, 0, 0, $tail, &@$);
/*% ripper: params!($:pre, Qnil, Qnil, Qnil, *$:tail[0..2]) %*/
}
| f_opt_arg(primary_value)[opt] ',' f_rest_arg[rest] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, 0, $opt, $rest, 0, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_opt_arg(primary_value)[opt] ',' f_rest_arg[rest] ',' f_arg[post] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, 0, $opt, $rest, $post, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, $:rest, $:post, *$:tail[0..2]) %*/
}
| f_opt_arg(primary_value)[opt] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, 0, $opt, 0, 0, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, Qnil, Qnil, *$:tail[0..2]) %*/
}
| f_opt_arg(primary_value)[opt] ',' f_arg[post] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, 0, $opt, 0, $post, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, Qnil, $:post, *$:tail[0..2]) %*/
}
| f_rest_arg[rest] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, 0, 0, $rest, 0, $tail, &@$);
/*% ripper: params!(Qnil, Qnil, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_rest_arg[rest] ',' f_arg[post] opt_args_tail(block_args_tail)[tail]
{
$$ = new_args(p, 0, 0, $rest, $post, $tail, &@$);
/*% ripper: params!(Qnil, Qnil, $:rest, $:post, *$:tail[0..2]) %*/
}
| block_args_tail[tail]
{
$$ = new_args(p, 0, 0, 0, 0, $tail, &@$);
/*% ripper: params!(Qnil, Qnil, Qnil, Qnil, *$:tail[0..2]) %*/
}
| tail-only-args(block_args_tail)
;

opt_block_param_def : none
Expand All @@ -5069,15 +5016,6 @@ block_param_def : '|' opt_block_param opt_bv_decl '|'
$$ = $2;
/*% ripper: block_var!($:2, $:3) %*/
}
| '|' f_arg excessed_comma opt_bv_decl '|'
{
p->max_numparam = ORDINAL_PARAM;
p->ctxt.in_argdef = 0;
$$ = new_args_tail(p, 0, 0, 0, &@3);
$$ = new_args(p, $2, 0, $3, 0, $$, &@$);
/*% ripper: params!($:2, Qnil, $:3, Qnil, Qnil, Qnil, Qnil) %*/
/*% ripper: block_var!($:$, $:4) %*/
}
;

opt_block_param : /* none */
Expand Down Expand Up @@ -6260,10 +6198,15 @@ superclass : '<'
;

f_opt_paren_args: f_paren_args
| /* none */
| f_empty_arg
{
p->ctxt.in_argdef = 0;
$$ = new_args_tail(p, 0, 0, 0, &@$);
}
;

f_empty_arg : /* none */
{
$$ = new_empty_args_tail(p, &@$);
$$ = new_args(p, 0, 0, 0, 0, $$, &@$);
/*% ripper: params!(Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil) %*/
}
Expand Down Expand Up @@ -6315,84 +6258,91 @@ args_tail : args_tail_basic(arg_value)
}
;

f_args : f_arg[pre] ',' f_opt_arg(arg_value)[opt] ',' f_rest_arg[rest] opt_args_tail(args_tail)[tail]
%rule args-list(value, tail) <node_args>
: f_arg[pre] ',' f_opt_arg(value)[opt] ',' f_rest_arg[rest] tail
{
$$ = new_args(p, $pre, $opt, $rest, 0, $tail, &@$);
/*% ripper: params!($:pre, $:opt, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_opt_arg(arg_value)[opt] ',' f_rest_arg[rest] ',' f_arg[post] opt_args_tail(args_tail)[tail]
| f_arg[pre] ',' f_opt_arg(value)[opt] ',' f_rest_arg[rest] ',' f_arg[post] tail
{
$$ = new_args(p, $pre, $opt, $rest, $post, $tail, &@$);
/*% ripper: params!($:pre, $:opt, $:rest, $:post, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_opt_arg(arg_value)[opt] opt_args_tail(args_tail)[tail]
| f_arg[pre] ',' f_opt_arg(value)[opt] tail
{
$$ = new_args(p, $pre, $opt, 0, 0, $tail, &@$);
/*% ripper: params!($:pre, $:opt, Qnil, Qnil, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_opt_arg(arg_value)[opt] ',' f_arg[post] opt_args_tail(args_tail)[tail]
| f_arg[pre] ',' f_opt_arg(value)[opt] ',' f_arg[post] tail
{
$$ = new_args(p, $pre, $opt, 0, $post, $tail, &@$);
/*% ripper: params!($:pre, $:opt, Qnil, $:post, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_rest_arg[rest] opt_args_tail(args_tail)[tail]
| f_arg[pre] ',' f_rest_arg[rest] tail
{
$$ = new_args(p, $pre, 0, $rest, 0, $tail, &@$);
/*% ripper: params!($:pre, Qnil, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_arg[pre] ',' f_rest_arg[rest] ',' f_arg[post] opt_args_tail(args_tail)[tail]
| f_arg[pre] ',' f_rest_arg[rest] ',' f_arg[post] tail
{
$$ = new_args(p, $pre, 0, $rest, $post, $tail, &@$);
/*% ripper: params!($:pre, Qnil, $:rest, $:post, *$:tail[0..2]) %*/
}
| f_arg[pre] opt_args_tail(args_tail)[tail]
{
$$ = new_args(p, $pre, 0, 0, 0, $tail, &@$);
/*% ripper: params!($:pre, Qnil, Qnil, Qnil, *$:tail[0..2]) %*/
}
| f_opt_arg(arg_value)[opt] ',' f_rest_arg[rest] opt_args_tail(args_tail)[tail]
| f_opt_arg(value)[opt] ',' f_rest_arg[rest] tail
{
$$ = new_args(p, 0, $opt, $rest, 0, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_opt_arg(arg_value)[opt] ',' f_rest_arg[rest] ',' f_arg[post] opt_args_tail(args_tail)[tail]
| f_opt_arg(value)[opt] ',' f_rest_arg[rest] ',' f_arg[post] tail
{
$$ = new_args(p, 0, $opt, $rest, $post, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, $:rest, $:post, *$:tail[0..2]) %*/
}
| f_opt_arg(arg_value)[opt] opt_args_tail(args_tail)[tail]
| f_opt_arg(value)[opt] tail
{
$$ = new_args(p, 0, $opt, 0, 0, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, Qnil, Qnil, *$:tail[0..2]) %*/
}
| f_opt_arg(arg_value)[opt] ',' f_arg[post] opt_args_tail(args_tail)[tail]
| f_opt_arg(value)[opt] ',' f_arg[post] tail
{
$$ = new_args(p, 0, $opt, 0, $post, $tail, &@$);
/*% ripper: params!(Qnil, $:opt, Qnil, $:post, *$:tail[0..2]) %*/
}
| f_rest_arg[rest] opt_args_tail(args_tail)[tail]
| f_rest_arg[rest] tail
{
$$ = new_args(p, 0, 0, $rest, 0, $tail, &@$);
/*% ripper: params!(Qnil, Qnil, $:rest, Qnil, *$:tail[0..2]) %*/
}
| f_rest_arg[rest] ',' f_arg[post] opt_args_tail(args_tail)[tail]
| f_rest_arg[rest] ',' f_arg[post] tail
{
$$ = new_args(p, 0, 0, $rest, $post, $tail, &@$);
/*% ripper: params!(Qnil, Qnil, $:rest, $:post, *$:tail[0..2]) %*/
}
| args_tail[tail]
;

%rule tail-only-args(tail) <node_args>
: tail
{
$$ = new_args(p, 0, 0, 0, 0, $tail, &@$);
/*% ripper: params!(Qnil, Qnil, Qnil, Qnil, *$:tail[0..2]) %*/
}
| /* none */
;

f_args-opt_tail : opt_args_tail(args_tail)
;

f_args : args-list(arg_value, f_args-opt_tail)
| f_arg[pre] f_args-opt_tail[tail]
{
$$ = new_args_tail(p, 0, 0, 0, &@$);
$$ = new_args(p, 0, 0, 0, 0, $$, &@$);
/*% ripper: params!(Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil) %*/
$$ = new_args(p, $pre, 0, 0, 0, $tail, &@$);
/*% ripper: params!($:pre, Qnil, Qnil, Qnil, *$:tail[0..2]) %*/
}
| tail-only-args(args_tail)
| f_empty_arg
;


args_forward : tBDOT3
{
$$ = idFWD_KWREST;
Expand Down Expand Up @@ -14542,7 +14492,7 @@ args_with_numbered(struct parser_params *p, rb_node_args_t *args, int max_numpar
if (max_numparam > NO_PARAM || it_id) {
if (!args) {
YYLTYPE loc = RUBY_INIT_YYLLOC();
args = new_args_tail(p, 0, 0, 0, 0);
args = new_empty_args_tail(p, 0);
nd_set_loc(RNODE(args), &loc);
}
args->nd_ainfo.pre_args_num = it_id ? 1 : max_numparam;
Expand Down
2 changes: 2 additions & 0 deletions tool/lrama/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# NEWS for Lrama

## Lrama 0.8.0 (2026-xx-xx)

## Lrama 0.7.1 (2025-12-24)

### Optimize IELR
Expand Down
1 change: 1 addition & 0 deletions tool/lrama/lib/lrama/grammar/binding.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def concatenated_args_str(token)
def create_instantiate_rule(sym)
Lrama::Lexer::Token::InstantiateRule.new(
s_value: sym.s_value,
alias_name: sym.alias_name,
location: sym.location,
args: resolve_args(sym.args),
lhs_tag: sym.lhs_tag
Expand Down
35 changes: 27 additions & 8 deletions tool/lrama/lib/lrama/grammar/code/rule_action.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ class RuleAction < Code
#
# @rbs!
# @rule: Rule
# @grammar: Grammar

# @rbs (type: ::Symbol, token_code: Lexer::Token::UserCode, rule: Rule) -> void
def initialize(type:, token_code:, rule:)
# @rbs (type: ::Symbol, token_code: Lexer::Token::UserCode, rule: Rule, grammar: Grammar) -> void
def initialize(type:, token_code:, rule:, grammar:)
super(type: type, token_code: token_code)
@rule = rule
@grammar = grammar
end

private
Expand Down Expand Up @@ -53,19 +55,31 @@ def reference_to_c(ref)
case
when ref.type == :dollar && ref.name == "$" # $$
tag = ref.ex_tag || lhs.tag
raise_tag_not_found_error(ref) unless tag
# @type var tag: Lexer::Token::Tag
"(yyval.#{tag.member})"
if tag
# @type var tag: Lexer::Token::Tag
"(yyval.#{tag.member})"
elsif union_not_defined?
# When %union is not defined, YYSTYPE defaults to int
"(yyval)"
else
raise_tag_not_found_error(ref)
end
when ref.type == :at && ref.name == "$" # @$
"(yyloc)"
when ref.type == :index && ref.name == "$" # $:$
raise "$:$ is not supported"
when ref.type == :dollar # $n
i = -position_in_rhs + ref.index
tag = ref.ex_tag || rhs[ref.index - 1].tag
raise_tag_not_found_error(ref) unless tag
# @type var tag: Lexer::Token::Tag
"(yyvsp[#{i}].#{tag.member})"
if tag
# @type var tag: Lexer::Token::Tag
"(yyvsp[#{i}].#{tag.member})"
elsif union_not_defined?
# When %union is not defined, YYSTYPE defaults to int
"(yyvsp[#{i}])"
else
raise_tag_not_found_error(ref)
end
when ref.type == :at # @n
i = -position_in_rhs + ref.index
"(yylsp[#{i}])"
Expand Down Expand Up @@ -99,6 +113,11 @@ def lhs
@rule.lhs
end

# @rbs () -> bool
def union_not_defined?
@grammar.union.nil?
end

# @rbs (Reference ref) -> bot
def raise_tag_not_found_error(ref)
raise "Tag is not specified for '$#{ref.value}' in '#{@rule.display_name}'"
Expand Down
6 changes: 3 additions & 3 deletions tool/lrama/lib/lrama/grammar/rule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ def initial_rule?
id == 0
end

# @rbs () -> String?
def translated_code
# @rbs (Grammar grammar) -> String?
def translated_code(grammar)
return nil unless token_code

Code::RuleAction.new(type: :rule_action, token_code: token_code, rule: self).translated_code
Code::RuleAction.new(type: :rule_action, token_code: token_code, rule: self, grammar: grammar).translated_code
end

# @rbs () -> bool
Expand Down
2 changes: 1 addition & 1 deletion tool/lrama/lib/lrama/output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def user_actions
<<-STR
case #{rule.id + 1}: /* #{rule.as_comment} */
#line #{code.line} "#{@grammar_file_path}"
#{spaces}{#{rule.translated_code}}
#{spaces}{#{rule.translated_code(@grammar)}}
#line [@oline@] [@ofile@]
break;
Expand Down
Loading