summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/dbldef.check14
-rw-r--r--test/files/neg/dbldef.scala1
-rw-r--r--test/files/neg/scopes.check29
-rw-r--r--test/files/neg/scopes.scala2
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