Merge pull request scala#688 from scalamacros/topic/quickfix-09bf95675b

jsuereth · jsuereth · commit 43ae8259f2e0 · 2012-06-08T19:42:03.000-07:00
A quickfix for 09bf956
diff --git a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
@@ -268,7 +268,7 @@ abstract class AddInterfaces extends InfoTransform { self: Erasure =>
       val oldSyms = vparamss.flatten.map(_.symbol)
       val newSyms = impl.info.paramss.flatten
       assert(oldSyms.length == newSyms.length, (oldSyms, impl, impl.info))
-      tree.substTreeSyms(oldSyms, newSyms)
+      tree.substituteSymbols(oldSyms, newSyms)
     }
     new ChangeOwnerAndReturnTraverser(newTree.symbol, impl)(newTree setSymbol impl)
   }

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ abstract class AddInterfaces extends InfoTransform { self: Erasure =>`
`268`	`268`	`val oldSyms = vparamss.flatten.map(_.symbol)`
`269`	`269`	`val newSyms = impl.info.paramss.flatten`
`270`	`270`	`assert(oldSyms.length == newSyms.length, (oldSyms, impl, impl.info))`
`271`		`- tree.substTreeSyms(oldSyms, newSyms)`
	`271`	`+ tree.substituteSymbols(oldSyms, newSyms)`
`272`	`272`	`}`
`273`	`273`	`new ChangeOwnerAndReturnTraverser(newTree.symbol, impl)(newTree setSymbol impl)`
`274`	`274`	`}`