Clarify condition for block_given? desugar

amomchilov · amomchilov · commit cbebf5c9d4fd · 2025-12-05T15:53:53.000-05:00
Checking the `enclosingBlockParamName` was really just a proxy for
whether we were in a method or not.

Even for methods with no explicit block parameter, `buildMethod()`,
will add a synthetic `&amp;&lt;blk&gt;`, so the if we're in a method,
`enclosingBlockParamName` is always set by the time it's checked here.
diff --git a/ast/desugar/Desugar.cc b/ast/desugar/Desugar.cc
@@ -748,7 +748,7 @@ ExpressionPtr node2TreeImplBody(DesugarContext dctx, parser::Node *what) {
                     flags.isPrivateOk = true;
                 }
 
-                if (isCallToBlockGivenP(send, rec) && dctx.enclosingBlockParamName.exists()) {
+                if (isCallToBlockGivenP(send, rec) && dctx.enclosingMethodLoc.exists()) {
                     // Desugar:
                     //     def foo(&my_block)
                     //       x = block_given?
diff --git a/ast/desugar/PrismDesugar.cc b/ast/desugar/PrismDesugar.cc
@@ -732,7 +732,7 @@ ExpressionPtr node2TreeImplBody(DesugarContext dctx, parser::Node *what) {
                     flags.isPrivateOk = true;
                 }
 
-                if (isCallToBlockGivenP(send, rec) && dctx.enclosingBlockParamName.exists()) {
+                if (isCallToBlockGivenP(send, rec) && dctx.enclosingMethodLoc.exists()) {
                     // Desugar:
                     //     def foo(&my_block)
                     //       x = block_given?

Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,7 @@ ExpressionPtr node2TreeImplBody(DesugarContext dctx, parser::Node *what) {`
`748`	`748`	`flags.isPrivateOk = true;`
`749`	`749`	`}`
`750`	`750`
`751`		`- if (isCallToBlockGivenP(send, rec) && dctx.enclosingBlockParamName.exists()) {`
	`751`	`+ if (isCallToBlockGivenP(send, rec) && dctx.enclosingMethodLoc.exists()) {`
`752`	`752`	`// Desugar:`
`753`	`753`	`// def foo(&my_block)`
`754`	`754`	`// x = block_given?`
Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@ ExpressionPtr node2TreeImplBody(DesugarContext dctx, parser::Node *what) {`
`732`	`732`	`flags.isPrivateOk = true;`
`733`	`733`	`}`
`734`	`734`
`735`		`- if (isCallToBlockGivenP(send, rec) && dctx.enclosingBlockParamName.exists()) {`
	`735`	`+ if (isCallToBlockGivenP(send, rec) && dctx.enclosingMethodLoc.exists()) {`
`736`	`736`	`// Desugar:`
`737`	`737`	`// def foo(&my_block)`
`738`	`738`	`// x = block_given?`