diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-02-10 16:51:13 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-02-10 16:51:13 +0000 |
commit | 4de81a05b3cc682a92eb43fb023314d580f639fb (patch) | |
tree | d96436ea1aac0a332dab5bdc3aab31b71b12bd43 /test/files/buildmanager/t2651_4 | |
parent | a165920200847b9aa336786dffc5d33ce5b86ab8 (diff) | |
download | scala-4de81a05b3cc682a92eb43fb023314d580f639fb.tar.gz scala-4de81a05b3cc682a92eb43fb023314d580f639fb.tar.bz2 scala-4de81a05b3cc682a92eb43fb023314d580f639fb.zip |
Closes #2651
Diffstat (limited to 'test/files/buildmanager/t2651_4')
-rw-r--r-- | test/files/buildmanager/t2651_4/A.scala | 5 | ||||
-rw-r--r-- | test/files/buildmanager/t2651_4/B.scala | 3 | ||||
-rw-r--r-- | test/files/buildmanager/t2651_4/t2651_4.changes/A2.scala | 5 | ||||
-rw-r--r-- | test/files/buildmanager/t2651_4/t2651_4.check | 13 | ||||
-rw-r--r-- | test/files/buildmanager/t2651_4/t2651_4.test | 3 |
5 files changed, 29 insertions, 0 deletions
diff --git a/test/files/buildmanager/t2651_4/A.scala b/test/files/buildmanager/t2651_4/A.scala new file mode 100644 index 0000000000..63f2a1643e --- /dev/null +++ b/test/files/buildmanager/t2651_4/A.scala @@ -0,0 +1,5 @@ +trait A[T, S] { + def x: T + def y(a: T) + def z[B <: T] +} diff --git a/test/files/buildmanager/t2651_4/B.scala b/test/files/buildmanager/t2651_4/B.scala new file mode 100644 index 0000000000..b33dbde676 --- /dev/null +++ b/test/files/buildmanager/t2651_4/B.scala @@ -0,0 +1,3 @@ +trait B extends A[Int, String] { + def x = 3 +} diff --git a/test/files/buildmanager/t2651_4/t2651_4.changes/A2.scala b/test/files/buildmanager/t2651_4/t2651_4.changes/A2.scala new file mode 100644 index 0000000000..f155129d13 --- /dev/null +++ b/test/files/buildmanager/t2651_4/t2651_4.changes/A2.scala @@ -0,0 +1,5 @@ +trait A[S, T] { + def x: T + def y(a: T) + def z[B <: T] +} diff --git a/test/files/buildmanager/t2651_4/t2651_4.check b/test/files/buildmanager/t2651_4/t2651_4.check new file mode 100644 index 0000000000..c4ce382b5f --- /dev/null +++ b/test/files/buildmanager/t2651_4/t2651_4.check @@ -0,0 +1,13 @@ +builder > A.scala B.scala +compiling Set(A.scala, B.scala) +Changes: Map() +builder > A.scala +compiling Set(A.scala) +Changes: Map(trait A -> List(Changed(Definition(A.x))[method x changed from ()T to ()T flags: <deferred> <method>], Changed(Definition(A.y))[method y changed from (a: T)Unit to (a: T)Unit flags: <deferred> <method>], Changed(Definition(A.z))[method z changed from [B <: T]()Unit to [B <: T]()Unit flags: <deferred> <method>])) +invalidate B.scala because inherited method changed [Changed(Definition(A.x))[method x changed from ()T to ()T flags: <deferred> <method>]] +compiling Set(B.scala) +B.scala:2: error: type mismatch; + found : Int(3) + required: String + def x = 3 + ^ diff --git a/test/files/buildmanager/t2651_4/t2651_4.test b/test/files/buildmanager/t2651_4/t2651_4.test new file mode 100644 index 0000000000..6f3bd03361 --- /dev/null +++ b/test/files/buildmanager/t2651_4/t2651_4.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala +>>update A.scala=>A2.scala +>>compile A.scala |