diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-10-01 13:42:07 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-10-01 13:42:07 +1000 |
commit | f42efa3b225dc82a83fb1c7730e9218e5c8a0325 (patch) | |
tree | b55513a0edf9c11c4120214d0966bd431435a968 | |
parent | d98bcdc81f9730e17cb5a46d390c0835ca298966 (diff) | |
download | scala-async-f42efa3b225dc82a83fb1c7730e9218e5c8a0325.tar.gz scala-async-f42efa3b225dc82a83fb1c7730e9218e5c8a0325.tar.bz2 scala-async-f42efa3b225dc82a83fb1c7730e9218e5c8a0325.zip |
Additional tests and comments around mkZero for value classes
-rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 12 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/toughtype/ToughType.scala | 24 |
2 files changed, 35 insertions, 1 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index da70f68..9ae48ed 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -333,10 +333,20 @@ private[async] trait TransformUtils { def mkZero(tp: Type): Tree = { if (tp.typeSymbol.asClass.isDerivedValueClass) { val argZero = mkZero(derivedValueClassUnbox(tp.typeSymbol).infoIn(tp).resultType) + val baseType = tp.baseType(tp.typeSymbol) // use base type here to dealias / strip phantom "tagged types" etc. + + // By explicitly attributing the types and symbols here, we subvert privacy. + // Otherwise, ticket86PrivateValueClass would fail. + + // Approximately: + // q"new ${valueClass}[$..targs](argZero)" val target: Tree = gen.mkAttributedSelect( c.typecheck(atMacroPos( - New(TypeTree(tp.baseType(tp.typeSymbol))))), tp.typeSymbol.asClass.primaryConstructor) + New(TypeTree(baseType)))), tp.typeSymbol.asClass.primaryConstructor) + val zero = gen.mkMethodCall(target, argZero :: Nil) + + // restore the original type which we might otherwise have weakened with `baseType` above gen.mkCast(zero, tp) } else { gen.mkZero(tp) diff --git a/src/test/scala/scala/async/run/toughtype/ToughType.scala b/src/test/scala/scala/async/run/toughtype/ToughType.scala index aedaf10..9ae33b1 100644 --- a/src/test/scala/scala/async/run/toughtype/ToughType.scala +++ b/src/test/scala/scala/async/run/toughtype/ToughType.scala @@ -286,6 +286,24 @@ class ToughTypeSpec { val result = Await.result(fut, 5.seconds) result mustBe None } + + @Test def ticket86PrivateValueClass(): Unit = { + import ExecutionContext.Implicits.global + + def doAThing(param: PrivateWrapper) = Future(None) + + val fut = async { + Option(PrivateWrapper.Instance) match { + case Some(valueHolder) => + await(doAThing(valueHolder)) + case None => + None + } + } + + val result = Await.result(fut, 5.seconds) + result mustBe None + } } class IntWrapper(val value: String) extends AnyVal { @@ -293,6 +311,12 @@ class IntWrapper(val value: String) extends AnyVal { } class ParamWrapper[T](val value: T) extends AnyVal +class PrivateWrapper private (private val value: String) extends AnyVal +object PrivateWrapper { + def Instance = new PrivateWrapper("") +} + + trait A trait B |