diff options
author | Martin Odersky <odersky@gmail.com> | 2014-03-16 15:27:50 +0100 |
---|---|---|
committer | Tobias Schlatter <tobias@meisch.ch> | 2014-03-21 11:24:03 +0100 |
commit | bb90b26fbca27f432ade46ae572b82e1b8027b19 (patch) | |
tree | 20da120bf3790ab18a9b6d8c02e44e682418db1c /tests/untried | |
parent | a7d47ab54cbfb324dec4ee1594e24738cd54113a (diff) | |
download | dotty-bb90b26fbca27f432ade46ae572b82e1b8027b19.tar.gz dotty-bb90b26fbca27f432ade46ae572b82e1b8027b19.tar.bz2 dotty-bb90b26fbca27f432ade46ae572b82e1b8027b19.zip |
Tests t01xx and t02xx
Test t0288 moved to disabled due to lack of Java interop.
Test t0273 fixed by relaxing double def condition: We only regard two
definitions that define the same name and have exactly the same signature
as double definitions. Previously, signatures that defined the same parameters
were also excluded.
Diffstat (limited to 'tests/untried')
-rw-r--r-- | tests/untried/pos/t0123.scala | 3 | ||||
-rw-r--r-- | tests/untried/pos/t0154.scala | 10 | ||||
-rw-r--r-- | tests/untried/pos/t0165.scala | 14 | ||||
-rw-r--r-- | tests/untried/pos/t0204.scala | 7 | ||||
-rw-r--r-- | tests/untried/pos/t0227.scala | 31 | ||||
-rw-r--r-- | tests/untried/pos/t0231.scala | 17 | ||||
-rw-r--r-- | tests/untried/pos/t0273.scala | 6 | ||||
-rw-r--r-- | tests/untried/pos/t0288/Foo.scala | 9 | ||||
-rw-r--r-- | tests/untried/pos/t0288/Outer.java | 9 |
9 files changed, 0 insertions, 106 deletions
diff --git a/tests/untried/pos/t0123.scala b/tests/untried/pos/t0123.scala deleted file mode 100644 index 79f0c907a..000000000 --- a/tests/untried/pos/t0123.scala +++ /dev/null @@ -1,3 +0,0 @@ -class M{ - val 1 = 1; -} diff --git a/tests/untried/pos/t0154.scala b/tests/untried/pos/t0154.scala deleted file mode 100644 index 9fb943067..000000000 --- a/tests/untried/pos/t0154.scala +++ /dev/null @@ -1,10 +0,0 @@ -package test -trait MyMatchers { - val StringMatch = new AnyRef {} - trait Something { - (null : AnyRef) match { - case (StringMatch) => - case _ => - } - } -} diff --git a/tests/untried/pos/t0165.scala b/tests/untried/pos/t0165.scala deleted file mode 100644 index 76aef8524..000000000 --- a/tests/untried/pos/t0165.scala +++ /dev/null @@ -1,14 +0,0 @@ -package test3 -import scala.collection.mutable.LinkedHashMap - -trait Main { - def asMany : ArrayResult = { - object result extends LinkedHashMap[String,String] with ArrayResult { - def current = result - } - result - } - trait ArrayResult { - def current : scala.collection.Map[String,String] - } -} diff --git a/tests/untried/pos/t0204.scala b/tests/untried/pos/t0204.scala deleted file mode 100644 index 23d36523e..000000000 --- a/tests/untried/pos/t0204.scala +++ /dev/null @@ -1,7 +0,0 @@ -class A { - object B { - def f() = { - class C extends A {}; new C : A - } - } -} diff --git a/tests/untried/pos/t0227.scala b/tests/untried/pos/t0227.scala deleted file mode 100644 index 806b20d40..000000000 --- a/tests/untried/pos/t0227.scala +++ /dev/null @@ -1,31 +0,0 @@ -final class Settings { - def f[T](a_args: T*): List[T] = Nil -} - -abstract class Factory { - type libraryType <: Base - - final def apply(settings: Settings): libraryType = sys.error("bla") -} - -abstract class Base { - val settings: Settings - - protected val demands: List[Factory] = Nil -} - -class SA(val settings: Settings) extends Base { - override val demands = List( - SD - ) ::: settings.f( - SC - ) -} - -object SC extends Factory { - type libraryType = Base -} - -object SD extends Factory { - type libraryType = SA -} diff --git a/tests/untried/pos/t0231.scala b/tests/untried/pos/t0231.scala deleted file mode 100644 index 0850d7a57..000000000 --- a/tests/untried/pos/t0231.scala +++ /dev/null @@ -1,17 +0,0 @@ -class Foo { - def aaa: Unit = { - println("a") - } -} - -class Bar extends Foo { - object b { - //println("b: " + a) //OK - println("b: " + Bar.super.aaa) - } -} - -object bug extends App { - new Bar - () -} diff --git a/tests/untried/pos/t0273.scala b/tests/untried/pos/t0273.scala deleted file mode 100644 index ac02b8c15..000000000 --- a/tests/untried/pos/t0273.scala +++ /dev/null @@ -1,6 +0,0 @@ -class A - -object Test { -def a = () => () -def a[T] = (p:A) => () -} diff --git a/tests/untried/pos/t0288/Foo.scala b/tests/untried/pos/t0288/Foo.scala deleted file mode 100644 index 778ba65f5..000000000 --- a/tests/untried/pos/t0288/Foo.scala +++ /dev/null @@ -1,9 +0,0 @@ -package test2; - -import test.Outer; - -class Foo extends Outer{ - - val bar = new Inner(); // Shouldn't this work? - -} diff --git a/tests/untried/pos/t0288/Outer.java b/tests/untried/pos/t0288/Outer.java deleted file mode 100644 index bea3e3f8d..000000000 --- a/tests/untried/pos/t0288/Outer.java +++ /dev/null @@ -1,9 +0,0 @@ -package test; - -public class Outer{ - - public class Inner{ - - } - -} |