merge revision(s) 91c0048: [Backport #19025]

nagachika · nagachika · commit 465eb7418d7e · 2023-07-22T11:55:49.000+09:00
[Bug #19025] Numbered parameter names are always local variables

	---
	 parse.y                  | 2 +-
	 test/ruby/test_syntax.rb | 1 +
	 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/parse.y b/parse.y
@@ -9775,9 +9775,9 @@ parse_ident(struct parser_params *p, int c, int cmd_state)
     ident = tokenize_ident(p, last_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)) {
-	SET_LEX_STATE(EXPR_END|EXPR_LABEL);
+        (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */
+        (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
@@ -1670,6 +1670,8 @@ def test_numbered_parameter
         assert_raise(NameError) {eval("_1")},
       ]
     }
+
+    assert_valid_syntax("p { [_1 **2] }")
   end
 
   def test_value_expr_in_condition
diff --git a/version.h b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 95
+#define RUBY_PATCHLEVEL 96
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"

Original file line number	Diff line number	Diff line change
`@@ -9775,9 +9775,9 @@ parse_ident(struct parser_params *p, int c, int cmd_state)`
`9775`	`9775`	`ident = tokenize_ident(p, last_state);`
`9776`	`9776`	`if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER;`
`9777`	`9777`	`if (!IS_lex_state_for(last_state, EXPR_DOT\|EXPR_FNAME) &&`
`9778`		`- (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */`
`9779`		`- lvar_defined(p, ident)) {`
`9780`		`- SET_LEX_STATE(EXPR_END\|EXPR_LABEL);`
	`9778`	`+ (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */`
	`9779`	`+ (lvar_defined(p, ident) \|\| NUMPARAM_ID_P(ident))) {`
	`9780`	`+ SET_LEX_STATE(EXPR_END\|EXPR_LABEL);`
`9781`	`9781`	`}`
`9782`	`9782`	`return result;`
`9783`	`9783`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1670,6 +1670,8 @@ def test_numbered_parameter`
`1670`	`1670`	`assert_raise(NameError) {eval("_1")},`
`1671`	`1671`	`]`
`1672`	`1672`	`}`
	`1673`	`+`
	`1674`	`+ assert_valid_syntax("p { [_1 **2] }")`
`1673`	`1675`	`end`
`1674`	`1676`
`1675`	`1677`	`def test_value_expr_in_condition`