diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-29 11:23:52 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-29 11:23:52 +0000 |
commit | 449c680774473deb5d004095a419e4a3bfce3637 (patch) | |
tree | 282d47c1e1cf9f122646ddd9d086d2aa0868065d /test/files/buildmanager/t2650_2 | |
parent | 7d08bfed7896ece313f6a0ad286a0a622f0a4b52 (diff) | |
download | scala-449c680774473deb5d004095a419e4a3bfce3637.tar.gz scala-449c680774473deb5d004095a419e4a3bfce3637.tar.bz2 scala-449c680774473deb5d004095a419e4a3bfce3637.zip |
Closes #2650.
Diffstat (limited to 'test/files/buildmanager/t2650_2')
-rw-r--r-- | test/files/buildmanager/t2650_2/A.scala | 3 | ||||
-rw-r--r-- | test/files/buildmanager/t2650_2/B.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2650_2/t2650_2.changes/A2.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2650_2/t2650_2.check | 13 | ||||
-rw-r--r-- | test/files/buildmanager/t2650_2/t2650_2.test | 3 |
5 files changed, 27 insertions, 0 deletions
diff --git a/test/files/buildmanager/t2650_2/A.scala b/test/files/buildmanager/t2650_2/A.scala new file mode 100644 index 0000000000..bcea634485 --- /dev/null +++ b/test/files/buildmanager/t2650_2/A.scala @@ -0,0 +1,3 @@ +trait A { + type S = Int +} diff --git a/test/files/buildmanager/t2650_2/B.scala b/test/files/buildmanager/t2650_2/B.scala new file mode 100644 index 0000000000..22a3a9a48e --- /dev/null +++ b/test/files/buildmanager/t2650_2/B.scala @@ -0,0 +1,4 @@ +trait B extends A { + def x: S + def y: Int = x +} diff --git a/test/files/buildmanager/t2650_2/t2650_2.changes/A2.scala b/test/files/buildmanager/t2650_2/t2650_2.changes/A2.scala new file mode 100644 index 0000000000..8274c1b62d --- /dev/null +++ b/test/files/buildmanager/t2650_2/t2650_2.changes/A2.scala @@ -0,0 +1,4 @@ +trait A { + type S = Long +} + diff --git a/test/files/buildmanager/t2650_2/t2650_2.check b/test/files/buildmanager/t2650_2/t2650_2.check new file mode 100644 index 0000000000..7ab72fb619 --- /dev/null +++ b/test/files/buildmanager/t2650_2/t2650_2.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.S))[type S changed from A.this.S to A.this.S flags: ])) +invalidate B.scala because inherited method changed [Changed(Definition(A.S))[type S changed from A.this.S to A.this.S flags: ]] +compiling Set(B.scala) +B.scala:3: error: type mismatch; + found : B.this.S + required: Int + def y: Int = x + ^ diff --git a/test/files/buildmanager/t2650_2/t2650_2.test b/test/files/buildmanager/t2650_2/t2650_2.test new file mode 100644 index 0000000000..6f3bd03361 --- /dev/null +++ b/test/files/buildmanager/t2650_2/t2650_2.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala +>>update A.scala=>A2.scala +>>compile A.scala |