Restore in_defined flag at nested defined?

nobu · nobu · commit b55785579cf1 · 2023-09-12T22:02:48.000+09:00
diff --git a/parse.y b/parse.y
@@ -1617,7 +1617,7 @@ static int looking_at_eol_p(struct parser_params *p);
 %type <id>   f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon
 %type <id>   p_kwrest p_kwnorest p_any_kwrest p_kw_label
 %type <id>   f_no_kwarg f_any_kwrest args_forward excessed_comma nonlocal_var
- %type <ctxt> lex_ctxt k_class k_module /* keep <ctxt> in ripper */
+ %type <ctxt> lex_ctxt begin_defined k_class k_module /* keep <ctxt> in ripper */
 %token END_OF_INPUT 0	"end-of-input"
 %token <id> '.'
 /* escaped chars, should be ignored otherwise */
@@ -2966,9 +2966,9 @@ arg		: lhs '=' lex_ctxt arg_rhs
                     {
                         $$ = logop(p, idOROP, $1, $3, &@2, &@$);
                     }
-                | keyword_defined opt_nl {p->ctxt.in_defined = 1;} arg
+                | keyword_defined opt_nl begin_defined arg
                     {
-                        p->ctxt.in_defined = 0;
+                        p->ctxt.in_defined = $3.in_defined;
                         $$ = new_defined(p, $4, &@$);
                     }
                 | arg '?' arg opt_nl ':' arg
@@ -3045,6 +3045,13 @@ lex_ctxt	: none
                     }
                 ;
 
+begin_defined	: lex_ctxt
+                    {
+                        p->ctxt.in_defined = 1;
+                        $$ = $1;
+                    }
+                ;
+
 arg_value	: arg
                     {
                         value_expr($1);
@@ -3435,9 +3442,9 @@ primary		: literal
                     /*% %*/
                     /*% ripper: yield0! %*/
                     }
-                | keyword_defined opt_nl '(' {p->ctxt.in_defined = 1;} expr rparen
+                | keyword_defined opt_nl '(' begin_defined expr rparen
                     {
-                        p->ctxt.in_defined = 0;
+                        p->ctxt.in_defined = $4.in_defined;
                         $$ = new_defined(p, $5, &@$);
                     }
                 | keyword_not '(' expr rparen

Original file line number	Diff line number	Diff line change
`@@ -1617,7 +1617,7 @@ static int looking_at_eol_p(struct parser_params *p);`
`1617`	`1617`	`%type <id> f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon`
`1618`	`1618`	`%type <id> p_kwrest p_kwnorest p_any_kwrest p_kw_label`
`1619`	`1619`	`%type <id> f_no_kwarg f_any_kwrest args_forward excessed_comma nonlocal_var`
`1620`		`- %type <ctxt> lex_ctxt k_class k_module /* keep <ctxt> in ripper */`
	`1620`	`+ %type <ctxt> lex_ctxt begin_defined k_class k_module /* keep <ctxt> in ripper */`
`1621`	`1621`	`%token END_OF_INPUT 0 "end-of-input"`
`1622`	`1622`	`%token <id> '.'`
`1623`	`1623`	`/* escaped chars, should be ignored otherwise */`
`@@ -2966,9 +2966,9 @@ arg : lhs '=' lex_ctxt arg_rhs`
`2966`	`2966`	`{`
`2967`	`2967`	`$$ = logop(p, idOROP, $1, $3, &@2, &@$);`
`2968`	`2968`	`}`
`2969`		`- \| keyword_defined opt_nl {p->ctxt.in_defined = 1;} arg`
	`2969`	`+ \| keyword_defined opt_nl begin_defined arg`
`2970`	`2970`	`{`
`2971`		`- p->ctxt.in_defined = 0;`
	`2971`	`+ p->ctxt.in_defined = $3.in_defined;`
`2972`	`2972`	`$$ = new_defined(p, $4, &@$);`
`2973`	`2973`	`}`
`2974`	`2974`	`\| arg '?' arg opt_nl ':' arg`
`@@ -3045,6 +3045,13 @@ lex_ctxt : none`
`3045`	`3045`	`}`
`3046`	`3046`	`;`
`3047`	`3047`
	`3048`	`+begin_defined : lex_ctxt`
	`3049`	`+ {`
	`3050`	`+ p->ctxt.in_defined = 1;`
	`3051`	`+ $$ = $1;`
	`3052`	`+ }`
	`3053`	`+ ;`
	`3054`	`+`
`3048`	`3055`	`arg_value : arg`
`3049`	`3056`	`{`
`3050`	`3057`	`value_expr($1);`
`@@ -3435,9 +3442,9 @@ primary : literal`
`3435`	`3442`	`/% %/`
`3436`	`3443`	`/% ripper: yield0! %/`
`3437`	`3444`	`}`
`3438`		`- \| keyword_defined opt_nl '(' {p->ctxt.in_defined = 1;} expr rparen`
	`3445`	`+ \| keyword_defined opt_nl '(' begin_defined expr rparen`
`3439`	`3446`	`{`
`3440`		`- p->ctxt.in_defined = 0;`
	`3447`	`+ p->ctxt.in_defined = $4.in_defined;`
`3441`	`3448`	`$$ = new_defined(p, $5, &@$);`
`3442`	`3449`	`}`
`3443`	`3450`	`\| keyword_not '(' expr rparen`