diff options
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/macro-blackbox-dynamic-materialization/Macros_1.scala | 2 | ||||
-rw-r--r-- | test/files/neg/macro-blackbox-fundep-materialization/Macros_1.scala | 8 | ||||
-rw-r--r-- | test/files/neg/macro-divergence-controlled/Impls_Macros_1.scala | 4 | ||||
-rw-r--r-- | test/files/neg/t6323a.check | 2 | ||||
-rw-r--r-- | test/files/neg/t6931.check | 10 | ||||
-rw-r--r-- | test/files/neg/t6931/Macros_1.scala | 15 | ||||
-rw-r--r-- | test/files/neg/t6931/Test_2.scala | 4 | ||||
-rw-r--r-- | test/files/neg/t8104/Macros_1.scala | 4 | ||||
-rw-r--r-- | test/files/neg/t8300-overloading.check | 7 | ||||
-rw-r--r-- | test/files/neg/t8300-overloading.scala | 16 |
10 files changed, 62 insertions, 10 deletions
diff --git a/test/files/neg/macro-blackbox-dynamic-materialization/Macros_1.scala b/test/files/neg/macro-blackbox-dynamic-materialization/Macros_1.scala index 3cfbdf45e9..fc2907b6dc 100644 --- a/test/files/neg/macro-blackbox-dynamic-materialization/Macros_1.scala +++ b/test/files/neg/macro-blackbox-dynamic-materialization/Macros_1.scala @@ -18,7 +18,7 @@ object Macros { def impl[T: c.WeakTypeTag](c: Context) = { import c.universe._ val tpe = weakTypeOf[T] - if (tpe.members.exists(_.typeSignature =:= typeOf[Int])) + if (tpe.members.exists(_.info =:= typeOf[Int])) c.abort(c.enclosingPosition, "I don't like classes that contain integers") q"new Foo[$tpe]{ override def toString = ${tpe.toString} }" } diff --git a/test/files/neg/macro-blackbox-fundep-materialization/Macros_1.scala b/test/files/neg/macro-blackbox-fundep-materialization/Macros_1.scala index a6f7de23bb..8d776388ee 100644 --- a/test/files/neg/macro-blackbox-fundep-materialization/Macros_1.scala +++ b/test/files/neg/macro-blackbox-fundep-materialization/Macros_1.scala @@ -15,12 +15,12 @@ object Iso { val sym = c.weakTypeOf[T].typeSymbol if (!sym.isClass || !sym.asClass.isCaseClass) c.abort(c.enclosingPosition, s"$sym is not a case class") - val fields = sym.typeSignature.declarations.toList.collect{ case x: TermSymbol if x.isVal && x.isCaseAccessor => x } + val fields = sym.info.decls.toList.collect{ case x: TermSymbol if x.isVal && x.isCaseAccessor => x } def mkTpt() = { val core = Ident(TupleClass(fields.length) orElse UnitClass) if (fields.length == 0) core - else AppliedTypeTree(core, fields map (f => TypeTree(f.typeSignature))) + else AppliedTypeTree(core, fields map (f => TypeTree(f.info))) } def mkFrom() = { @@ -32,8 +32,8 @@ object Iso { List(AppliedTypeTree(Ident(newTypeName("Iso")), List(Ident(sym), mkTpt()))), emptyValDef, List( - DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(tpnme.EMPTY), tpnme.EMPTY), nme.CONSTRUCTOR), List())), Literal(Constant(())))), + DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(typeNames.EMPTY), typeNames.EMPTY), termNames.CONSTRUCTOR), List())), Literal(Constant(())))), DefDef(Modifiers(), newTermName("to"), List(), List(List(ValDef(Modifiers(PARAM), newTermName("f"), Ident(sym), EmptyTree))), TypeTree(), mkFrom())))) - c.Expr[Iso[T, U]](Block(List(evidenceClass), Apply(Select(New(Ident(newTypeName("$anon"))), nme.CONSTRUCTOR), List()))) + c.Expr[Iso[T, U]](Block(List(evidenceClass), Apply(Select(New(Ident(newTypeName("$anon"))), termNames.CONSTRUCTOR), List()))) } } diff --git a/test/files/neg/macro-divergence-controlled/Impls_Macros_1.scala b/test/files/neg/macro-divergence-controlled/Impls_Macros_1.scala index 186c285871..5c04503260 100644 --- a/test/files/neg/macro-divergence-controlled/Impls_Macros_1.scala +++ b/test/files/neg/macro-divergence-controlled/Impls_Macros_1.scala @@ -9,8 +9,8 @@ object Complex { def impl[T: c.WeakTypeTag](c: Context): c.Expr[Complex[T]] = { import c.universe._ val tpe = weakTypeOf[T] - for (f <- tpe.declarations.collect{case f: TermSymbol if f.isParamAccessor && !f.isMethod => f}) { - val trecur = appliedType(typeOf[Complex[_]], List(f.typeSignature)) + for (f <- tpe.decls.collect{case f: TermSymbol if f.isParamAccessor && !f.isMethod => f}) { + val trecur = appliedType(typeOf[Complex[_]], List(f.info)) if (c.openImplicits.tail.exists(ic => ic.pt =:= trecur)) c.abort(c.enclosingPosition, "diverging implicit expansion. reported by a macro!") val recur = c.inferImplicitValue(trecur, silent = true) if (recur == EmptyTree) c.abort(c.enclosingPosition, s"couldn't synthesize $trecur") diff --git a/test/files/neg/t6323a.check b/test/files/neg/t6323a.check index b649cfc86f..261a60ef3c 100644 --- a/test/files/neg/t6323a.check +++ b/test/files/neg/t6323a.check @@ -6,7 +6,7 @@ t6323a.scala:11: materializing requested reflect.runtime.universe.type.TypeTag[T ^ t6323a.scala:11: `package`.this.materializeTypeTag[Test](scala.reflect.runtime.`package`.universe) is not a valid implicit value for reflect.runtime.universe.TypeTag[Test] because: failed to typecheck the materialized tag: -cannot create a TypeTag referring to local class Test.Test: use WeakTypeTag instead +cannot create a TypeTag referring to class Test.Test local to the reifee: use WeakTypeTag instead val value = u.typeOf[Test] ^ t6323a.scala:11: error: No TypeTag available for Test diff --git a/test/files/neg/t6931.check b/test/files/neg/t6931.check new file mode 100644 index 0000000000..7cf804a936 --- /dev/null +++ b/test/files/neg/t6931.check @@ -0,0 +1,10 @@ +Test_2.scala:3: error: 1 + err"123" + ^ +Test_2.scala:3: error: 2 + err"123" + ^ +Test_2.scala:3: error: 3 + err"123" + ^ +three errors found diff --git a/test/files/neg/t6931/Macros_1.scala b/test/files/neg/t6931/Macros_1.scala new file mode 100644 index 0000000000..56da075d1f --- /dev/null +++ b/test/files/neg/t6931/Macros_1.scala @@ -0,0 +1,15 @@ +import scala.language.experimental.macros +import scala.reflect.macros.blackbox.Context + +object Macros { + implicit class Error(ctx: StringContext) { + def err(args: Any*): Unit = macro impl + } + + def impl(c: Context)(args: c.Tree*): c.Tree = { + import c.universe._ + val q"Macros.Error(scala.StringContext.apply($arg)).err()" = c.macroApplication + for (i <- 1 to 3) c.error(arg.pos.withPoint(arg.pos.point + i - 1), i.toString) + q"()" + } +}
\ No newline at end of file diff --git a/test/files/neg/t6931/Test_2.scala b/test/files/neg/t6931/Test_2.scala new file mode 100644 index 0000000000..6a6f645904 --- /dev/null +++ b/test/files/neg/t6931/Test_2.scala @@ -0,0 +1,4 @@ +object Test extends App { + import Macros._ + err"123" +}
\ No newline at end of file diff --git a/test/files/neg/t8104/Macros_1.scala b/test/files/neg/t8104/Macros_1.scala index 2ad4bc5a99..e135bd807b 100644 --- a/test/files/neg/t8104/Macros_1.scala +++ b/test/files/neg/t8104/Macros_1.scala @@ -4,8 +4,8 @@ object Macros { def impl[T](c: Context)(implicit T: c.WeakTypeTag[T]) = { import c.universe._ import definitions._ - val fields = T.tpe.declarations.toList.collect{ case x: TermSymbol if x.isVal && x.isCaseAccessor => x } - val Repr = appliedType(TupleClass(fields.length).asType.toType, fields.map(_.typeSignature)) + val fields = T.tpe.decls.toList.collect{ case x: TermSymbol if x.isVal && x.isCaseAccessor => x } + val Repr = appliedType(TupleClass(fields.length).asType.toType, fields.map(_.info)) q"new Generic[$T]{ type Repr = $Repr }" } }
\ No newline at end of file diff --git a/test/files/neg/t8300-overloading.check b/test/files/neg/t8300-overloading.check new file mode 100644 index 0000000000..edd34d44bd --- /dev/null +++ b/test/files/neg/t8300-overloading.check @@ -0,0 +1,7 @@ +t8300-overloading.scala:15: error: double definition: +def foo(name: Test.u.Name): Nothing at line 14 and +def foo(name: Test.u.TermName): Nothing at line 15 +have same type after erasure: (name: Universe#NameApi)Nothing + def foo(name: TermName) = ??? + ^ +one error found diff --git a/test/files/neg/t8300-overloading.scala b/test/files/neg/t8300-overloading.scala new file mode 100644 index 0000000000..eb393155a0 --- /dev/null +++ b/test/files/neg/t8300-overloading.scala @@ -0,0 +1,16 @@ +// cf. pos/t8300-overloading.scala +trait Universe { + type Name >: Null <: AnyRef with NameApi + trait NameApi + + type TermName >: Null <: Name with TermNameApi + trait TermNameApi extends NameApi +} + +object Test extends App { + val u: Universe = ??? + import u._ + + def foo(name: Name) = ??? + def foo(name: TermName) = ??? +}
\ No newline at end of file |