[Bug #19025] Numbered parameter names are always local variables

nobu · nobu · commit 91c004885fc7 · 2023-05-14T22:16:15.000+09:00
diff --git a/parse.y b/parse.y
@@ -9749,7 +9749,7 @@ parse_ident(struct parser_params *p, int c, int cmd_state)
     if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER;
     if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) &&
         (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */
-        lvar_defined(p, ident)) {
+        (lvar_defined(p, ident) || NUMPARAM_ID_P(ident))) {
         SET_LEX_STATE(EXPR_END|EXPR_LABEL);
     }
     return result;
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
@@ -1672,6 +1672,7 @@ def test_numbered_parameter
     }
 
     assert_valid_syntax("proc {def foo(_);end;_1}")
+    assert_valid_syntax("p { [_1 **2] }")
   end
 
   def test_value_expr_in_condition

Original file line number	Diff line number	Diff line change
`@@ -9749,7 +9749,7 @@ parse_ident(struct parser_params *p, int c, int cmd_state)`
`9749`	`9749`	`if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER;`
`9750`	`9750`	`if (!IS_lex_state_for(last_state, EXPR_DOT\|EXPR_FNAME) &&`
`9751`	`9751`	`(result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */`
`9752`		`- lvar_defined(p, ident)) {`
	`9752`	`+ (lvar_defined(p, ident) \|\| NUMPARAM_ID_P(ident))) {`
`9753`	`9753`	`SET_LEX_STATE(EXPR_END\|EXPR_LABEL);`
`9754`	`9754`	`}`
`9755`	`9755`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -1672,6 +1672,7 @@ def test_numbered_parameter`
`1672`	`1672`	`}`
`1673`	`1673`
`1674`	`1674`	`assert_valid_syntax("proc {def foo(_);end;_1}")`
	`1675`	`+ assert_valid_syntax("p { [_1 **2] }")`
`1675`	`1676`	`end`
`1676`	`1677`
`1677`	`1678`	`def test_value_expr_in_condition`