diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-26 14:21:58 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-26 14:21:58 +0000 |
commit | 8856f21f59ff735db7951901a799300a5affd9cc (patch) | |
tree | a9db04b6760d4bdaf929a419fa48c784ece03c12 /test/files/buildmanager/t2790 | |
parent | 6441087c31b9f550bb36d6afac4cfc7d4292b7cd (diff) | |
download | scala-8856f21f59ff735db7951901a799300a5affd9cc.tar.gz scala-8856f21f59ff735db7951901a799300a5affd9cc.tar.bz2 scala-8856f21f59ff735db7951901a799300a5affd9cc.zip |
Another batch of tests. No review.
Diffstat (limited to 'test/files/buildmanager/t2790')
-rw-r--r-- | test/files/buildmanager/t2790/A.scala | 5 | ||||
-rw-r--r-- | test/files/buildmanager/t2790/B.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2790/t2790.changes/A2.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2790/t2790.check | 14 | ||||
-rw-r--r-- | test/files/buildmanager/t2790/t2790.test | 3 |
5 files changed, 30 insertions, 0 deletions
diff --git a/test/files/buildmanager/t2790/A.scala b/test/files/buildmanager/t2790/A.scala new file mode 100644 index 0000000000..6e9c1a90db --- /dev/null +++ b/test/files/buildmanager/t2790/A.scala @@ -0,0 +1,5 @@ +object A { + def x(f: String, g: Int): Int = g + def x(f: Int, g: Int = 3): Int = g +} + diff --git a/test/files/buildmanager/t2790/B.scala b/test/files/buildmanager/t2790/B.scala new file mode 100644 index 0000000000..441055ca12 --- /dev/null +++ b/test/files/buildmanager/t2790/B.scala @@ -0,0 +1,4 @@ +object B { + val y = A.x(5) +} + diff --git a/test/files/buildmanager/t2790/t2790.changes/A2.scala b/test/files/buildmanager/t2790/t2790.changes/A2.scala new file mode 100644 index 0000000000..704ef4e96e --- /dev/null +++ b/test/files/buildmanager/t2790/t2790.changes/A2.scala @@ -0,0 +1,4 @@ +object A { + def x(f: String, g: Int = 3): Int = g + def x(f: Int, g: Int): Int = g +} diff --git a/test/files/buildmanager/t2790/t2790.check b/test/files/buildmanager/t2790/t2790.check new file mode 100644 index 0000000000..065956765a --- /dev/null +++ b/test/files/buildmanager/t2790/t2790.check @@ -0,0 +1,14 @@ +builder > A.scala B.scala +compiling Set(A.scala, B.scala) +Changes: Map() +builder > A.scala +compiling Set(A.scala) +Changes: Map(object A -> List(Added(Definition(A.x)), Changed(Definition(A.x))[value x changed from (f: java.lang.String,g: Int)Int to (f: java.lang.String,g: Int)Int <and> (f: Int,g: Int)Int flags: <method>])) +invalidate B.scala because it references changed definition [Changed(Definition(A.x))[value x changed from (f: java.lang.String,g: Int)Int to (f: java.lang.String,g: Int)Int <and> (f: Int,g: Int)Int flags: <method>]] +compiling Set(B.scala) +B.scala:2: error: type mismatch; + found : Int(5) + required: String +Error occured in an application involving default arguments. + val y = A.x(5) + ^ diff --git a/test/files/buildmanager/t2790/t2790.test b/test/files/buildmanager/t2790/t2790.test new file mode 100644 index 0000000000..6f3bd03361 --- /dev/null +++ b/test/files/buildmanager/t2790/t2790.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala +>>update A.scala=>A2.scala +>>compile A.scala |