diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-10-21 08:05:55 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-10-21 08:05:55 +0000 |
| commit | 81443d309e6af3f7daa51ddb323e19818334d784 (patch) | |
| tree | b58ba0fedfafcc8938dc4674254f29234c468012 /test/files | |
| parent | 2b417333e336d66c97a6b6175a30aa086ba6d45b (diff) | |
| download | scala-81443d309e6af3f7daa51ddb323e19818334d784.tar.gz scala-81443d309e6af3f7daa51ddb323e19818334d784.tar.bz2 scala-81443d309e6af3f7daa51ddb323e19818334d784.zip | |
splitting up scopes test into two parts.
the behavior on the IBM VMs is really funny. when running the scopes
test individually (using partest or ant), it succeeds. even when running
all the neg tests with ant it succeeds. but when running the whole test
suite, it fails.
no review.
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/neg/dbldef.check | 14 | ||||
| -rw-r--r-- | test/files/neg/dbldef.scala | 1 | ||||
| -rw-r--r-- | test/files/neg/scopes.check | 29 | ||||
| -rw-r--r-- | test/files/neg/scopes.scala | 2 |
4 files changed, 23 insertions, 23 deletions
diff --git a/test/files/neg/dbldef.check b/test/files/neg/dbldef.check new file mode 100644 index 0000000000..3ee63475e4 --- /dev/null +++ b/test/files/neg/dbldef.check @@ -0,0 +1,14 @@ +dbldef.scala:1: error: x is already defined as value x +case class test0(x: Int, x: Float) + ^ +dbldef.scala:1: error: type mismatch; + found : Float + required: Int +case class test0(x: Int, x: Float) + ^ +dbldef.scala:1: error: type mismatch; + found : Float + required: Int +case class test0(x: Int, x: Float) + ^ +three errors found diff --git a/test/files/neg/dbldef.scala b/test/files/neg/dbldef.scala new file mode 100644 index 0000000000..c70fb97b2c --- /dev/null +++ b/test/files/neg/dbldef.scala @@ -0,0 +1 @@ +case class test0(x: Int, x: Float) diff --git a/test/files/neg/scopes.check b/test/files/neg/scopes.check index 54c5d5b5e1..2f2eaa758f 100644 --- a/test/files/neg/scopes.check +++ b/test/files/neg/scopes.check @@ -1,35 +1,22 @@ -scopes.scala:1: error: x is already defined as value x -case class test0(x: Int, x: Float) - ^ -scopes.scala:1: error: type mismatch; - found : Float - required: Int -case class test0(x: Int, x: Float) - ^ -scopes.scala:5: error: t is already defined as type t +scopes.scala:3: error: t is already defined as type t type t = Float ^ -scopes.scala:7: error: x is already defined as value x +scopes.scala:5: error: x is already defined as value x val x: Float = .0f; ^ -scopes.scala:10: error: y is already defined as value y +scopes.scala:8: error: y is already defined as value y val y: Float = .0f ^ -scopes.scala:13: error: x is already defined as value x +scopes.scala:11: error: x is already defined as value x def f1(x: Int, x: Float) = x ^ -scopes.scala:14: error: y is already defined as value y +scopes.scala:12: error: y is already defined as value y def f2(x: Int)(y: Int, y: Float) = x + y ^ -scopes.scala:15: error: x is already defined as value x +scopes.scala:13: error: x is already defined as value x val closure = (x: Int, x: Float) => x ^ -scopes.scala:17: error: x is already defined as value x +scopes.scala:15: error: x is already defined as value x case x::x => x ^ -scopes.scala:1: error: type mismatch; - found : Float - required: Int -case class test0(x: Int, x: Float) - ^ -10 errors found +7 errors found diff --git a/test/files/neg/scopes.scala b/test/files/neg/scopes.scala index fd31ff5f72..660e826619 100644 --- a/test/files/neg/scopes.scala +++ b/test/files/neg/scopes.scala @@ -1,5 +1,3 @@ -case class test0(x: Int, x: Float) - object test1 { type t = Int type t = Float |