diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-02-24 14:44:57 +0100 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-05 09:39:30 -0800 |
commit | fff0f50773b45690d571852b139bd6da7b6a45ae (patch) | |
tree | 9f53db9730fe2d07167e817d0692c3f53f483275 /src/compiler/scala/tools/nsc/transform/Mixin.scala | |
parent | c4341385629bd114b61c55103f1d83f26dce22f9 (diff) | |
download | scala-fff0f50773b45690d571852b139bd6da7b6a45ae.tar.gz scala-fff0f50773b45690d571852b139bd6da7b6a45ae.tar.bz2 scala-fff0f50773b45690d571852b139bd6da7b6a45ae.zip |
Name boolean arguments in src/compiler.
What would you prefer?
adaptToMemberWithArgs(tree, qual, name, mode, false, false)
Or:
adaptToMemberWithArgs(tree, qual, name, mode, reportAmbiguous = false, saveErrors = false)
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Mixin.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 74459efc92..988e80aa77 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -148,7 +148,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { sym => isConcreteAccessor(sym) && !sym.hasFlag(MIXEDIN) && - matchesType(sym.tpe, member.tpe, true)) + matchesType(sym.tpe, member.tpe, alwaysMatchSimple = true)) } ( bcs.head != member.owner && (hasOverridingAccessor(bcs.head) || isOverriddenAccessor(member, bcs.tail)) @@ -273,7 +273,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { val imember = member overriddenSymbol mixinInterface imember overridingSymbol clazz match { case NoSymbol => - if (clazz.info.findMember(member.name, 0, lateDEFERRED, false).alternatives contains imember) + if (clazz.info.findMember(member.name, 0, lateDEFERRED, stableOnly = false).alternatives contains imember) cloneAndAddMixinMember(mixinInterface, imember).asInstanceOf[TermSymbol] setAlias member case _ => } @@ -855,7 +855,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { val bitmapSym = bitmapFor(clazz, offset, lzyVal) val kind = bitmapKind(lzyVal) val mask = maskForOffset(offset, lzyVal, kind) - def cond = mkTest(clazz, mask, bitmapSym, true, kind) + def cond = mkTest(clazz, mask, bitmapSym, equalToZero = true, kind) val nulls = lazyValNullables(lzyVal).toList sortBy (_.id) map nullify def syncBody = init ::: List(mkSetFlag(clazz, offset, lzyVal, kind), UNIT) @@ -882,7 +882,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { val mask = maskForOffset(offset, sym, kind) val msg = s"Uninitialized field: ${unit.source}: ${pos.line}" val result = - IF (mkTest(clazz, mask, bitmapSym, false, kind)) . + IF (mkTest(clazz, mask, bitmapSym, equalToZero = false, kind)) . THEN (retVal) . ELSE (Throw(NewFromConstructor(UninitializedFieldConstructor, LIT(msg)))) |