diff options
Diffstat (limited to 'test/files')
77 files changed, 314 insertions, 30 deletions
diff --git a/test/files/continuations-run/z1673.check b/test/files/continuations-run/z1673.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/continuations-run/z1673.check +++ /dev/null diff --git a/test/files/jvm/t1116.check b/test/files/jvm/t1116.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/jvm/t1116.check +++ /dev/null diff --git a/test/files/jvm/t1143.check b/test/files/jvm/t1143.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/jvm/t1143.check +++ /dev/null diff --git a/test/files/jvm/t1948.check b/test/files/jvm/t1948.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/jvm/t1948.check +++ /dev/null diff --git a/test/files/jvm/t2104.check b/test/files/jvm/t2104.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/jvm/t2104.check +++ /dev/null diff --git a/test/files/jvm/t2570.check b/test/files/jvm/t2570.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/jvm/t2570.check +++ /dev/null diff --git a/test/files/jvm/t2585.check b/test/files/jvm/t2585.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/jvm/t2585.check +++ /dev/null diff --git a/test/files/jvm/t680.check b/test/files/jvm/t680.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/jvm/t680.check +++ /dev/null diff --git a/test/files/neg/t3871.check b/test/files/neg/t3871.check new file mode 100644 index 0000000000..b920357ee6 --- /dev/null +++ b/test/files/neg/t3871.check @@ -0,0 +1,7 @@ +t3871.scala:4: error: variable foo in class Sub2 cannot be accessed in Sub2 + Access to protected method foo not permitted because + enclosing class Base is not a subclass of + class Sub2 where target is defined + s.foo = true + ^ +one error found diff --git a/test/files/neg/t3871.scala b/test/files/neg/t3871.scala new file mode 100644 index 0000000000..fc459867df --- /dev/null +++ b/test/files/neg/t3871.scala @@ -0,0 +1,11 @@ +class Base { + def mkNew() = { + val s = new Sub2 + s.foo = true + s + } +} + +class Sub2 extends Base { + protected var foo = false +} diff --git a/test/files/neg/t3871b.check b/test/files/neg/t3871b.check new file mode 100644 index 0000000000..6ab5ddfaf1 --- /dev/null +++ b/test/files/neg/t3871b.check @@ -0,0 +1,97 @@ +t3871b.scala:61: error: not found: value protOT + protOT // not allowed + ^ +t3871b.scala:77: error: method prot in class A cannot be accessed in E.this.A + Access to protected method prot not permitted because + prefix type E.this.A does not conform to + class B in class E where the access take place + a.prot // not allowed, prefix type `A` does not conform to `B` + ^ +t3871b.scala:79: error: value protT is not a member of E.this.B + b.protT // not allowed + ^ +t3871b.scala:80: error: value protT is not a member of E.this.C + c.protT // not allowed + ^ +t3871b.scala:81: error: value protT is not a member of E.this.A + a.protT // not allowed + ^ +t3871b.scala:91: error: method prot in class A cannot be accessed in E.this.A + Access to protected method prot not permitted because + prefix type E.this.A does not conform to + object B in class E where the access take place + a.prot // not allowed + ^ +t3871b.scala:93: error: value protT is not a member of E.this.B + b.protT // not allowed + ^ +t3871b.scala:94: error: value protT is not a member of E.this.C + c.protT // not allowed + ^ +t3871b.scala:95: error: value protT is not a member of E.this.A + a.protT // not allowed + ^ +t3871b.scala:102: error: method prot in class A cannot be accessed in E.this.B + Access to protected method prot not permitted because + enclosing class Z in class E is not a subclass of + class A in class E where target is defined + b.prot // not allowed + ^ +t3871b.scala:103: error: method prot in class A cannot be accessed in E.this.C + Access to protected method prot not permitted because + enclosing class Z in class E is not a subclass of + class A in class E where target is defined + c.prot // not allowed + ^ +t3871b.scala:104: error: method prot in class A cannot be accessed in E.this.A + Access to protected method prot not permitted because + enclosing class Z in class E is not a subclass of + class A in class E where target is defined + a.prot // not allowed + ^ +t3871b.scala:109: error: value protT is not a member of E.this.B + b.protT // not allowed + ^ +t3871b.scala:110: error: value protT is not a member of E.this.C + c.protT // not allowed + ^ +t3871b.scala:111: error: value protT is not a member of E.this.A + a.protT // not allowed + ^ +t3871b.scala:120: error: method prot in class A cannot be accessed in Other.this.e.B + Access to protected method prot not permitted because + enclosing class Other is not a subclass of + class A in class E where target is defined + b.prot // not allowed + ^ +t3871b.scala:121: error: method prot in class A cannot be accessed in Other.this.e.C + Access to protected method prot not permitted because + enclosing class Other is not a subclass of + class A in class E where target is defined + c.prot // not allowed + ^ +t3871b.scala:122: error: method prot in class A cannot be accessed in Other.this.e.A + Access to protected method prot not permitted because + enclosing class Other is not a subclass of + class A in class E where target is defined + a.prot // not allowed + ^ +t3871b.scala:123: error: method protE in class A cannot be accessed in Other.this.e.B + Access to protected method protE not permitted because + enclosing class Other is not a subclass of + class A in class E where target is defined + b.protE // not allowed + ^ +t3871b.scala:124: error: method protE in class A cannot be accessed in Other.this.e.A + Access to protected method protE not permitted because + enclosing class Other is not a subclass of + class A in class E where target is defined + a.protE // not allowed + ^ +t3871b.scala:125: error: method protE in class A cannot be accessed in Other.this.e.C + Access to protected method protE not permitted because + enclosing class Other is not a subclass of + class A in class E where target is defined + c.protE // not allowed + ^ +21 errors found diff --git a/test/files/neg/t3871b.scala b/test/files/neg/t3871b.scala new file mode 100644 index 0000000000..b490b7789a --- /dev/null +++ b/test/files/neg/t3871b.scala @@ -0,0 +1,127 @@ +/** + +The protected modifier applies to class member definitions. Protected members of a class can be accessed from within + + 0a. the companion module of any of those classes + +A protected identifier x may be used as a member name in a selection r.x only +if one of the following applies: + 1a. The access is within the template defining the member, or, + if a qualification C is given, + 1b. inside the package C, or + 1c. the class C , or its companion module, or + 2. r is one of the reserved words this and super, or + 3. r’s type conforms to a type-instance of the class which contains the access. + + 4. A different form of qualification is protected[this]. A member M marked with this + modifier is called object-protected; it can be accessed only from within the object + in which it is defined. That is, a selection p.M is only legal if the prefix is this + or O.this, for some class O enclosing the reference. In addition, the restrictions + for unqualified protected apply. +*/ + +object E { + val e = new E + import e._ + def n(a: A, b: B, c: C) = { + b.protE // 1c + c.protE // 1c + a.protE // 1c + A.protOE // 1c + } +} + +class E { + object A { + protected def protO = 2 + protected[E] def protOE = 3 + protected[this] def protOT = 3 + } + class A { + protected def prot = 2 + protected[E] def protE = 3 + protected[this] def protT = 4 + + // 1a + prot; protE; protT + def foo = {prot; protE; protT} + new { prot; protE } + def this(a: Any) = {this(); prot; protE; protT} + object B extends A { + A.this.prot + A.this.protE + A.this.protT + } + + import A._ + // 0a + protO + // 3 + protOE + protOT // not allowed + } + + class B extends A { + // 1b + this.prot; this.protE; + super.prot; super.protE; + + // 4 + this.protT + // 4 !!! "or the super keyword" + super.protT + + def n(a: A, b: B, c: C) = { + b.prot // 3 + c.prot // 3 + a.prot // not allowed, prefix type `A` does not conform to `B` + + b.protT // not allowed + c.protT // not allowed + a.protT // not allowed + } + } + object B { + def n(a: A, b: B, c: C) = { + b.prot // 3 !!! + c.prot // 3 !!! + // Wording of 3 seems insufficient, missing: + // "... (if the access is from a class), or + // the type instance of companion class (if the access is from a module)" + a.prot // not allowed + + b.protT // not allowed + c.protT // not allowed + a.protT // not allowed + } + } + class C extends B + + class Z { + def n(a: A, b: B, c: C) = { + b.prot // not allowed + c.prot // not allowed + a.prot // not allowed + b.protE // 2 + a.protE // 2 + c.protE // 2 + + b.protT // not allowed + c.protT // not allowed + a.protT // not allowed + } + } +} + +class Other { + val e = new E + import e._ + def n(a: A, b: B, c: C) = { + b.prot // not allowed + c.prot // not allowed + a.prot // not allowed + b.protE // not allowed + a.protE // not allowed + c.protE // not allowed + } +} diff --git a/test/files/neg/t6260b.check b/test/files/neg/t6260b.check new file mode 100644 index 0000000000..3a7e8947aa --- /dev/null +++ b/test/files/neg/t6260b.check @@ -0,0 +1,7 @@ +t6260b.scala:3: error: bridge generated for member method apply: ()X in <$anon: () => X> +which overrides method apply: ()R in trait Function0 +clashes with definition of the member itself; +both have erased type ()Object +class Y { def f = new X("") or new X("") } + ^ +one error found diff --git a/test/files/neg/t6260b.scala b/test/files/neg/t6260b.scala new file mode 100644 index 0000000000..73e2e58f73 --- /dev/null +++ b/test/files/neg/t6260b.scala @@ -0,0 +1,3 @@ + +class X(val value: Object) extends AnyVal { def or(alt: => X): X = this } +class Y { def f = new X("") or new X("") } diff --git a/test/files/neg/t6260c.check b/test/files/neg/t6260c.check new file mode 100644 index 0000000000..cbbcfd1504 --- /dev/null +++ b/test/files/neg/t6260c.check @@ -0,0 +1,7 @@ +t6260c.scala:4: error: bridge generated for member method f: ()Option[A] in class Bar1 +which overrides method f: ()A in class Foo1 +clashes with definition of the member itself; +both have erased type ()Object + class Bar1[A] extends Foo1[Option[A]] { def f(): Option[A] = ??? } + ^ +one error found diff --git a/test/files/neg/t6260c.scala b/test/files/neg/t6260c.scala new file mode 100644 index 0000000000..02bf152376 --- /dev/null +++ b/test/files/neg/t6260c.scala @@ -0,0 +1,4 @@ +final class Option[+A](val value: A) extends AnyVal + +abstract class Foo1[A] { def f(): A } + class Bar1[A] extends Foo1[Option[A]] { def f(): Option[A] = ??? } diff --git a/test/files/neg/t6385.check b/test/files/neg/t6385.check deleted file mode 100644 index 93e51e8927..0000000000 --- a/test/files/neg/t6385.check +++ /dev/null @@ -1,7 +0,0 @@ -t6385.scala:12: error: bridge generated for member method x: ()C[T] in class C -which overrides method x: ()C[T] in trait AA -clashes with definition of the member itself; -both have erased type ()Object - def x = this - ^ -one error found diff --git a/test/files/neg/t6446-additional.check b/test/files/neg/t6446-additional.check index 6dfe072913..c91333830a 100755 --- a/test/files/neg/t6446-additional.check +++ b/test/files/neg/t6446-additional.check @@ -12,7 +12,7 @@ superaccessors 6 add super accessors in traits and nested classes uncurry 10 uncurry, translate function values to anonymous classes tailcalls 11 replace tail calls by jumps specialize 12 @specialized-driven class and method specialization - explicitouter 13 this refs to outer pointers, translate patterns + explicitouter 13 this refs to outer pointers erasure 14 erase types, add interfaces for traits posterasure 15 clean up erased inline classes lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs diff --git a/test/files/neg/t6446-missing.check b/test/files/neg/t6446-missing.check index ba5e30dc05..b2d5ddd686 100755 --- a/test/files/neg/t6446-missing.check +++ b/test/files/neg/t6446-missing.check @@ -13,7 +13,7 @@ superaccessors 6 add super accessors in traits and nested classes uncurry 10 uncurry, translate function values to anonymous classes tailcalls 11 replace tail calls by jumps specialize 12 @specialized-driven class and method specialization - explicitouter 13 this refs to outer pointers, translate patterns + explicitouter 13 this refs to outer pointers erasure 14 erase types, add interfaces for traits posterasure 15 clean up erased inline classes lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs diff --git a/test/files/neg/t6446-show-phases.check b/test/files/neg/t6446-show-phases.check index 10a9e08b86..48d4f37b3e 100644 --- a/test/files/neg/t6446-show-phases.check +++ b/test/files/neg/t6446-show-phases.check @@ -12,7 +12,7 @@ superaccessors 6 add super accessors in traits and nested classes uncurry 10 uncurry, translate function values to anonymous classes tailcalls 11 replace tail calls by jumps specialize 12 @specialized-driven class and method specialization - explicitouter 13 this refs to outer pointers, translate patterns + explicitouter 13 this refs to outer pointers erasure 14 erase types, add interfaces for traits posterasure 15 clean up erased inline classes lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs diff --git a/test/files/neg/t6680b.flags b/test/files/neg/t6680b.flags deleted file mode 100644 index a02d83efad..0000000000 --- a/test/files/neg/t6680b.flags +++ /dev/null @@ -1 +0,0 @@ --Xstrict-inference diff --git a/test/files/neg/t6680c.check b/test/files/neg/t6680c.check deleted file mode 100644 index 7a749de1f2..0000000000 --- a/test/files/neg/t6680c.check +++ /dev/null @@ -1,6 +0,0 @@ -t6680c.scala:15: error: type mismatch; - found : String("a string!") - required: S - res match { case Unfold(s, f) => f("a string!") } - ^ -one error found diff --git a/test/files/neg/t6680c.flags b/test/files/neg/t6680c.flags deleted file mode 100644 index a02d83efad..0000000000 --- a/test/files/neg/t6680c.flags +++ /dev/null @@ -1 +0,0 @@ --Xstrict-inference diff --git a/test/files/neg/t7494-no-options.check b/test/files/neg/t7494-no-options.check index 0bde84c96c..b5dc0e3d4f 100644 --- a/test/files/neg/t7494-no-options.check +++ b/test/files/neg/t7494-no-options.check @@ -13,7 +13,7 @@ superaccessors 6 add super accessors in traits and nested classes uncurry 10 uncurry, translate function values to anonymous classes tailcalls 11 replace tail calls by jumps specialize 12 @specialized-driven class and method specialization - explicitouter 13 this refs to outer pointers, translate patterns + explicitouter 13 this refs to outer pointers erasure 14 erase types, add interfaces for traits posterasure 15 clean up erased inline classes lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs diff --git a/test/files/neg/t7694b.check b/test/files/neg/t7694b.check deleted file mode 100644 index ea3d7736f8..0000000000 --- a/test/files/neg/t7694b.check +++ /dev/null @@ -1,7 +0,0 @@ -t7694b.scala:8: error: type arguments [_3,_4] do not conform to trait L's type parameter bounds [A2,B2 <: A2] - def d = if (true) (null: L[A, A]) else (null: L[B, B]) - ^ -t7694b.scala:9: error: type arguments [_1,_2] do not conform to trait L's type parameter bounds [A2,B2 <: A2] - val v = if (true) (null: L[A, A]) else (null: L[B, B]) - ^ -two errors found diff --git a/test/files/pos/annotated-treecopy.check b/test/files/pos/annotated-treecopy.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/annotated-treecopy.check +++ /dev/null diff --git a/test/files/pos/attachments-typed-another-ident.check b/test/files/pos/attachments-typed-another-ident.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/attachments-typed-another-ident.check +++ /dev/null diff --git a/test/files/pos/attachments-typed-ident.check b/test/files/pos/attachments-typed-ident.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/attachments-typed-ident.check +++ /dev/null diff --git a/test/files/pos/macro-qmarkqmarkqmark.check b/test/files/pos/macro-qmarkqmarkqmark.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/macro-qmarkqmarkqmark.check +++ /dev/null diff --git a/test/files/pos/t5692c.check b/test/files/pos/t5692c.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/t5692c.check +++ /dev/null diff --git a/test/files/pos/t5845.check b/test/files/pos/t5845.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/t5845.check +++ /dev/null diff --git a/test/files/pos/t6260a.scala b/test/files/pos/t6260a.scala new file mode 100644 index 0000000000..194294e981 --- /dev/null +++ b/test/files/pos/t6260a.scala @@ -0,0 +1,15 @@ +final class Option[+A](val value: A) extends AnyVal + +// Was: sandbox/test.scala:21: error: bridge generated for member method f: ()Option[A] in class Bar +// which overrides method f: ()Option[A] in class Foo" +abstract class Foo[A] { def f(): Option[A] } + class Bar[A] extends Foo[A] { def f(): Option[A] = ??? } + +// User reported this as erroneous but I couldn't reproduce with 2.10.{0,1,2,3} +// https://issues.scala-lang.org/browse/SI-6260?focusedCommentId=64764&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-64764 +// I suspect he whittled down the example too far. +class Wrapper(val value: Int) extends AnyVal +abstract class Test { def check(the: Wrapper): Boolean } +object T { + new Test { def check(the: Wrapper) = true } +} diff --git a/test/files/pos/t7461.check b/test/files/pos/t7461.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/t7461.check +++ /dev/null diff --git a/test/files/pos/t7928.scala b/test/files/pos/t7928.scala new file mode 100644 index 0000000000..d9e29935b3 --- /dev/null +++ b/test/files/pos/t7928.scala @@ -0,0 +1,16 @@ +trait OuterTrait { + trait InnerTrait { + type Element + type Collection <: Iterable[Inner.Element] + } + + val Inner: InnerTrait + +} + +object OuterObject extends OuterTrait { + object Inner extends InnerTrait { + type Element = String + override type Collection = Seq[Inner.Element] + } +} diff --git a/test/files/pos/virtpatmat_anonfun_for.flags b/test/files/pos/virtpatmat_anonfun_for.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/pos/virtpatmat_anonfun_for.flags +++ /dev/null diff --git a/test/files/presentation/partial-fun/partial-fun.check b/test/files/presentation/partial-fun/partial-fun.check deleted file mode 100644 index adceab8280..0000000000 --- a/test/files/presentation/partial-fun/partial-fun.check +++ /dev/null @@ -1 +0,0 @@ -reload: PartialFun.scala diff --git a/test/files/run/dead-code-elimination.check b/test/files/run/dead-code-elimination.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/dead-code-elimination.check +++ /dev/null diff --git a/test/files/run/exoticnames.check b/test/files/run/exoticnames.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/exoticnames.check +++ /dev/null diff --git a/test/files/run/intmap.check b/test/files/run/intmap.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/intmap.check +++ /dev/null diff --git a/test/files/run/longmap.check b/test/files/run/longmap.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/longmap.check +++ /dev/null diff --git a/test/files/run/macro-expand-tparams-bounds.check b/test/files/run/macro-expand-tparams-bounds.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/macro-expand-tparams-bounds.check +++ /dev/null diff --git a/test/files/run/macro-reify-nested-a.check b/test/files/run/macro-reify-nested-a.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/macro-reify-nested-a.check +++ /dev/null diff --git a/test/files/run/macro-reify-nested-b.check b/test/files/run/macro-reify-nested-b.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/macro-reify-nested-b.check +++ /dev/null diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 10d2ed5af7..cfa3ed3fb4 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -12,7 +12,7 @@ superaccessors 6 add super accessors in traits and nested classes uncurry 10 uncurry, translate function values to anonymous classes tailcalls 11 replace tail calls by jumps specialize 12 @specialized-driven class and method specialization - explicitouter 13 this refs to outer pointers, translate patterns + explicitouter 13 this refs to outer pointers erasure 14 erase types, add interfaces for traits posterasure 15 clean up erased inline classes lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs diff --git a/test/files/run/range.check b/test/files/run/range.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/range.check +++ /dev/null diff --git a/test/files/run/reflection-sync-potpourri.check b/test/files/run/reflection-sync-potpourri.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/reflection-sync-potpourri.check +++ /dev/null diff --git a/test/files/run/reify_for1.check b/test/files/run/reify_for1.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/reify_for1.check +++ /dev/null diff --git a/test/files/run/reify_fors_oldpatmat.flags b/test/files/run/reify_fors_oldpatmat.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/reify_fors_oldpatmat.flags +++ /dev/null diff --git a/test/files/run/reify_maps_oldpatmat.flags b/test/files/run/reify_maps_oldpatmat.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/reify_maps_oldpatmat.flags +++ /dev/null diff --git a/test/files/run/t0668.check b/test/files/run/t0668.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t0668.check +++ /dev/null diff --git a/test/files/run/t1829.check b/test/files/run/t1829.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t1829.check +++ /dev/null diff --git a/test/files/run/t2594_tcpoly.check b/test/files/run/t2594_tcpoly.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t2594_tcpoly.check +++ /dev/null diff --git a/test/files/run/t3346b.check b/test/files/run/t3346b.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t3346b.check +++ /dev/null diff --git a/test/files/run/t3346c.check b/test/files/run/t3346c.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t3346c.check +++ /dev/null diff --git a/test/files/run/t3346d.check b/test/files/run/t3346d.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t3346d.check +++ /dev/null diff --git a/test/files/run/t5229_1.check b/test/files/run/t5229_1.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5229_1.check +++ /dev/null diff --git a/test/files/run/t5271_4.check b/test/files/run/t5271_4.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5271_4.check +++ /dev/null diff --git a/test/files/run/t5272_1_oldpatmat.flags b/test/files/run/t5272_1_oldpatmat.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5272_1_oldpatmat.flags +++ /dev/null diff --git a/test/files/run/t5272_2_oldpatmat.flags b/test/files/run/t5272_2_oldpatmat.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5272_2_oldpatmat.flags +++ /dev/null diff --git a/test/files/run/t5273_1_oldpatmat.flags b/test/files/run/t5273_1_oldpatmat.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5273_1_oldpatmat.flags +++ /dev/null diff --git a/test/files/run/t5273_2a_oldpatmat.flags b/test/files/run/t5273_2a_oldpatmat.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5273_2a_oldpatmat.flags +++ /dev/null diff --git a/test/files/run/t5273_2b_oldpatmat.flags b/test/files/run/t5273_2b_oldpatmat.flags deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5273_2b_oldpatmat.flags +++ /dev/null diff --git a/test/files/run/t5415.check b/test/files/run/t5415.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5415.check +++ /dev/null diff --git a/test/files/run/t5418.check b/test/files/run/t5418.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5418.check +++ /dev/null diff --git a/test/files/run/t5545.check b/test/files/run/t5545.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5545.check +++ /dev/null diff --git a/test/files/run/t5923d.check b/test/files/run/t5923d.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5923d.check +++ /dev/null diff --git a/test/files/run/t5942.check b/test/files/run/t5942.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t5942.check +++ /dev/null diff --git a/test/files/run/t6197.check b/test/files/run/t6197.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t6197.check +++ /dev/null diff --git a/test/files/run/t6198.check b/test/files/run/t6198.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t6198.check +++ /dev/null diff --git a/test/files/run/t6240-universe-code-gen.check b/test/files/run/t6240-universe-code-gen.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t6240-universe-code-gen.check +++ /dev/null diff --git a/test/files/run/t6260b.scala b/test/files/run/t6260b.scala new file mode 100644 index 0000000000..dd2cf4bc4e --- /dev/null +++ b/test/files/run/t6260b.scala @@ -0,0 +1,13 @@ +class C[A](val a: A) extends AnyVal + +class DD { + def foo(c: C[String]) = () + def bar[A <: String](c: C[A]) = () + def baz[A](c: C[A]) = () +} + +object Test extends App { + classOf[DD].getMethod("foo", classOf[String]) + classOf[DD].getMethod("bar", classOf[String]) + classOf[DD].getMethod("baz", classOf[Object]) +} diff --git a/test/files/neg/t6385.scala b/test/files/run/t6385.scala index cec58eec9e..24fc3cd768 100644 --- a/test/files/neg/t6385.scala +++ b/test/files/run/t6385.scala @@ -1,8 +1,8 @@ -object N { +object Test { def main(args: Array[String]) { val y: AA[Int] = C(2) val c: Int = y.x.y - println(c) + assert(c == 2) } } trait AA[T] extends Any { diff --git a/test/files/run/t7240.check b/test/files/run/t7240.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t7240.check +++ /dev/null diff --git a/test/files/run/t7341.check b/test/files/run/t7341.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t7341.check +++ /dev/null diff --git a/test/files/run/t7510.check b/test/files/run/t7510.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t7510.check +++ /dev/null diff --git a/test/files/run/t7852.check b/test/files/run/t7852.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/t7852.check +++ /dev/null diff --git a/test/files/run/typetags_without_scala_reflect_manifest_lookup.check b/test/files/run/typetags_without_scala_reflect_manifest_lookup.check deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/files/run/typetags_without_scala_reflect_manifest_lookup.check +++ /dev/null |