Permalink
Browse files

Merge pull request #1774 from adriaanm/bc-2.9.3

binary compatibility compensation
  • Loading branch information...
2 parents 31518ee + a224bb7 commit 8810e7b6568f37ecae100c8d5257209820760bf9 @adriaanm adriaanm committed Dec 14, 2012
View
@@ -2131,10 +2131,10 @@ Binary compatibility testing
<mkdir dir="${bc-build.dir}"/>
<!-- Pull down MIMA -->
<artifact:dependencies pathId="mima.classpath">
- <dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.1" version="0.1.3"/>
+ <dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.4"/>
</artifact:dependencies>
<artifact:dependencies pathId="old.bc.classpath">
- <dependency groupId="org.scala-lang" artifactId="scala-library" version="2.9.0"/>
+ <dependency groupId="org.scala-lang" artifactId="scala-library" version="2.9.2"/>
</artifact:dependencies>
</target>
@@ -65,7 +65,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
storeAccessorDefinition(clazz, DefDef(acc, EmptyTree))
acc
}
-
+
atPos(sel.pos)(Select(gen.mkAttributedThis(clazz), superAcc) setType sel.tpe)
}
@@ -131,20 +131,20 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
// we need an accessor to get to a super on an outer thing, but only if we can't call name more directly on
// a trait implementation class. So this complicated condition is leaving alone cases where we don't need to do
// anything special (i.e. we're getting a direct super class) or where a later transform will inject a call to
- // a trait implementation method directly.
+ // a trait implementation method directly.
//
- // SI-6536 has more discussion about how this works.
+ // SI-6536 has more discussion about how this works.
//
- // So, we're looking for items of the form clazz.super[mix].name (or clazz.super.name wich is seen as
+ // So, we're looking for items of the form clazz.super[mix].name (or clazz.super.name wich is seen as
// clazz.super[EMPTY].name with some limitations. First, name has to be a term rather than a type.
- // Then there are a couple of cases.
+ // Then there are a couple of cases.
def requiresAccessor = name.isTermName && (mix match {
// If mix is empty then we only need an accessor if clazz is a trait, it's not this current class,
- // or the validCurentOwner setting is false...which...ugh, is a mess.
- case tpnme.EMPTY => clazz.isTrait || clazz != currentClass || !validCurrentOwner
+ // or the validCurentOwner setting is false...which...ugh, is a mess.
+ case tpnme.EMPTY => clazz.isTrait || clazz != currentClass || !validCurrentOwner
// If the mix is set then if it refers to a class and the clazz part isn't the current class
// it's not just super[mix].name then we need to generate an accessor.
- case _ => clazz != currentClass && !mixTpeIsTrait
+ case _ => clazz != currentClass && !mixTpeIsTrait
})
if (requiresAccessor) ensureAccessor(sel)
@@ -232,7 +232,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
parent.info.decls filterNot (x => x.isPrivate || x.hasLocalFlag) foreach { m2 =>
if (sym.name == m2.name && m2.isGetter && m2.accessed.isMutable) {
unit.warning(sel.pos,
- sym.accessString + " " + sym.fullLocationString + " shadows mutable " + m2.name
+ sym.fullLocationString + " shadows mutable " + m2.name
+ " inherited from " + m2.owner + ". Changes to " + m2.name + " will not be visible within "
+ sym.owner + " - you may want to give them distinct names."
)
@@ -263,7 +263,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
// FIXME - this should be unified with needsProtectedAccessor, but some
// subtlety which presently eludes me is foiling my attempts.
val shouldEnsureAccessor = (
- currentClass.isTrait
+ currentClass.isTrait
&& sym.isProtected
&& sym.enclClass != currentClass
&& !sym.owner.isTrait
@@ -479,7 +479,7 @@ self =>
final class StreamWithFilter(p: A => Boolean) extends WithFilter(p) {
override def map[B, That](f: A => B)(implicit bf: CanBuildFrom[Stream[A], B, That]): That = {
- def tailMap(coll: Stream[A]): Stream[B] = {
+ def tailMapConstStack(coll: Stream[A]): Stream[B] = {
var head: A = null.asInstanceOf[A]
var tail: Stream[A] = coll
while (true) {
@@ -488,17 +488,17 @@ self =>
head = tail.head
tail = tail.tail
if (p(head))
- return cons(f(head), tailMap(tail))
+ return cons(f(head), tailMapConstStack(tail))
}
throw new RuntimeException()
}
- if (isStreamBuilder(bf)) asThat(tailMap(Stream.this))
+ if (isStreamBuilder(bf)) asThat(tailMapConstStack(Stream.this))
else super.map(f)(bf)
}
override def flatMap[B, That](f: A => GenTraversableOnce[B])(implicit bf: CanBuildFrom[Stream[A], B, That]): That = {
- def tailFlatMap(coll: Stream[A]): Stream[B] = {
+ def tailFlatMapConstStack(coll: Stream[A]): Stream[B] = {
var head: A = null.asInstanceOf[A]
var tail: Stream[A] = coll
while (true) {
@@ -507,12 +507,12 @@ self =>
head = tail.head
tail = tail.tail
if (p(head))
- return f(head).toStream append tailFlatMap(tail)
+ return f(head).toStream append tailFlatMapConstStack(tail)
}
throw new RuntimeException()
}
- if (isStreamBuilder(bf)) asThat(tailFlatMap(Stream.this))
+ if (isStreamBuilder(bf)) asThat(tailFlatMapConstStack(Stream.this))
else super.flatMap(f)(bf)
}
@@ -522,6 +522,10 @@ self =>
override def withFilter(q: A => Boolean): StreamWithFilter =
new StreamWithFilter(x => p(x) && q(x))
+
+ // DO NOT USE -- for binary compatibility
+ def tailMap$1(f: Nothing => Nothing): Stream[Nothing] = null
+ def tailFlatMap$1(f: Nothing => Nothing): Stream[Nothing] = null
}
/** A lazier Iterator than LinearSeqLike's. */
@@ -183,20 +183,6 @@ import Flags._
def hasTraitFlag = hasFlag(TRAIT)
def hasDefaultFlag = hasFlag(DEFAULTPARAM)
- def accessString: String = {
- val pw = if (hasAccessBoundary) privateWithin.toString else ""
-
- if (pw == "") {
- if (hasAllFlags(PRIVATE | LOCAL)) "private[this]"
- else if (hasAllFlags(PROTECTED | LOCAL)) "protected[this]"
- else if (hasFlag(PRIVATE)) "private"
- else if (hasFlag(PROTECTED)) "protected"
- else ""
- }
- else if (hasFlag(PROTECTED)) "protected[" + pw + "]"
- else "private[" + pw + "]"
- }
-
// Straightforwardly named accessors already being used differently.
// These names are most likely temporary.
def hasAbstractFlag = hasFlag(ABSTRACT)

0 comments on commit 8810e7b

Please sign in to comment.