summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/transform/Mixin.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-09-10 00:35:22 +0000
committerPaul Phillips <paulp@improving.org>2011-09-10 00:35:22 +0000
commit8e8518864fb776e43a2c4cfb0b4117ce4e4e0754 (patch)
treed3f32cc03a1577a809af77906d7097fb41cabaaa /src/compiler/scala/tools/nsc/transform/Mixin.scala
parentcbf8534ff7a04603e7c47c0a2422c012ddd44810 (diff)
downloadscala-8e8518864fb776e43a2c4cfb0b4117ce4e4e0754.tar.gz
scala-8e8518864fb776e43a2c4cfb0b4117ce4e4e0754.tar.bz2
scala-8e8518864fb776e43a2c4cfb0b4117ce4e4e0754.zip
Method to zip value params and args.
I had all the variations of zip/zipped start logging when they being were given differently lengthed arguments, to find out what all we might be throwing away. This uncovered at least one bug with free variable identification, fixed herein, and also solidifed my belief that we should have a lot less ad hoc zipping of things. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Mixin.scala')
-rw-r--r--src/compiler/scala/tools/nsc/transform/Mixin.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index d43dfdd3d9..db39eda3b6 100644
--- a/src/compiler/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -284,9 +284,9 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL {
for (member <- mixinClass.info.decls) {
if (isConcreteAccessor(member)) {
if (isOverriddenAccessor(member, clazz.info.baseClasses)) {
- if (settings.debug.value)
- println("!!! is overridden val: "+member)
- } else {
+ debugwarn("!!! is overridden val: "+member.fullLocationString)
+ }
+ else {
// mixin field accessors
val member1 = addMember(
clazz,