diff options
| -rw-r--r-- | src/reflect/scala/reflect/internal/TreeGen.scala | 17 | ||||
| -rw-r--r-- | test/files/neg/warn-unused-privates.check | 4 | ||||
| -rw-r--r-- | test/files/neg/warn-unused-privates.scala | 21 |
3 files changed, 33 insertions, 9 deletions
diff --git a/src/reflect/scala/reflect/internal/TreeGen.scala b/src/reflect/scala/reflect/internal/TreeGen.scala index 4fecaf70df..373758d0a5 100644 --- a/src/reflect/scala/reflect/internal/TreeGen.scala +++ b/src/reflect/scala/reflect/internal/TreeGen.scala @@ -797,7 +797,7 @@ abstract class TreeGen { /** Create tree for for-comprehension generator <val pat0 <- rhs0> */ def mkGenerator(pos: Position, pat: Tree, valeq: Boolean, rhs: Tree)(implicit fresh: FreshNameCreator): Tree = { - val pat1 = patvarTransformer.transform(pat) + val pat1 = patvarTransformerForFor.transform(pat) if (valeq) ValEq(pat1, rhs).setPos(pos) else ValFrom(pat1, mkCheckIfRefutable(pat1, rhs)).setPos(pos) } @@ -894,11 +894,15 @@ abstract class TreeGen { * x becomes x @ _ * x: T becomes x @ (_: T) */ - object patvarTransformer extends Transformer { + class PatvarTransformer(forFor: Boolean) extends Transformer { override def transform(tree: Tree): Tree = tree match { - case Ident(name) if (treeInfo.isVarPattern(tree) && name != nme.WILDCARD) => - atPos(tree.pos)(Bind(name, atPos(tree.pos.focus) (Ident(nme.WILDCARD)))) - case Typed(id @ Ident(name), tpt) if (treeInfo.isVarPattern(id) && name != nme.WILDCARD) => + case Ident(name) if treeInfo.isVarPattern(tree) && name != nme.WILDCARD => + atPos(tree.pos) { + val b = Bind(name, atPos(tree.pos.focus) (Ident(nme.WILDCARD))) + if (forFor) b updateAttachment AtBoundIdentifierAttachment + else b + } + case Typed(id @ Ident(name), tpt) if treeInfo.isVarPattern(id) && name != nme.WILDCARD => atPos(tree.pos.withPoint(id.pos.point)) { Bind(name, atPos(tree.pos.withStart(tree.pos.point)) { Typed(Ident(nme.WILDCARD), tpt) @@ -918,6 +922,9 @@ abstract class TreeGen { tree } } + object patvarTransformer extends PatvarTransformer(forFor = false) + /** Tag pat vars in for comprehensions. */ + object patvarTransformerForFor extends PatvarTransformer(forFor = true) // annotate the expression with @unchecked def mkUnchecked(expr: Tree): Tree = atPos(expr.pos) { diff --git a/test/files/neg/warn-unused-privates.check b/test/files/neg/warn-unused-privates.check index d273aa40f4..c77fcff420 100644 --- a/test/files/neg/warn-unused-privates.check +++ b/test/files/neg/warn-unused-privates.check @@ -71,13 +71,13 @@ warn-unused-privates.scala:153: warning: local val z in method f is never used val C(x, y, Some(z)) = c // warn ^ warn-unused-privates.scala:161: warning: local val z in method h is never used - val C(x @ _, y @ _, z @ Some(_)) = c // warn? + val C(x @ _, y @ _, z @ Some(_)) = c // warn for z? ^ warn-unused-privates.scala:166: warning: local val x in method v is never used val D(x) = d // warn ^ warn-unused-privates.scala:170: warning: local val x in method w is never used - val D(x @ _) = d // fixme + val D(x @ _) = d // warn, fixme (valdef pos is different) ^ warn-unused-privates.scala:97: warning: local var x in method f2 is never set - it could be a val var x = 100 // warn about it being a var diff --git a/test/files/neg/warn-unused-privates.scala b/test/files/neg/warn-unused-privates.scala index 1b702c7555..bc2799067e 100644 --- a/test/files/neg/warn-unused-privates.scala +++ b/test/files/neg/warn-unused-privates.scala @@ -158,7 +158,7 @@ trait Boundings { 17 } def h() = { - val C(x @ _, y @ _, z @ Some(_)) = c // warn? + val C(x @ _, y @ _, z @ Some(_)) = c // warn for z? 17 } @@ -167,8 +167,25 @@ trait Boundings { 17 } def w() = { - val D(x @ _) = d // fixme + val D(x @ _) = d // warn, fixme (valdef pos is different) 17 } } + +trait Forever { + def f = { + val t = Option((17, 42)) + for { + ns <- t + (i, j) = ns // no warn + } yield (i + j) + } + def g = { + val t = Option((17, 42)) + for { + ns <- t + (i, j) = ns // warn, fixme + } yield 42 // val emitted only if needed, hence nothing unused + } +} |