summaryrefslogtreecommitdiff
path: root/test/pending/neg
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-11-02 14:34:35 +0000
committerHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-11-02 14:34:35 +0000
commitb6778be91900b8161e705dc2598ef7af86842b0b (patch)
treed15e8ec18a37eec212f50f1ace27714d7e7d4d34 /test/pending/neg
parentac6c76f26d884a94d0c9ff54f055d3f9ab750bac (diff)
downloadscala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.gz
scala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.bz2
scala-b6778be91900b8161e705dc2598ef7af86842b0b.zip
Begone t1737...
Diffstat (limited to 'test/pending/neg')
-rw-r--r--test/pending/neg/plugin-after-terminal/src/ThePlugin.scala6
-rw-r--r--test/pending/neg/plugin-before-parser/src/ThePlugin.scala6
-rw-r--r--test/pending/neg/plugin-cyclic-dependency/src/ThePlugin.scala10
-rw-r--r--test/pending/neg/plugin-multiple-rafter/src/ThePlugin.scala6
-rw-r--r--test/pending/neg/plugin-rafter-before-1/src/ThePlugin.scala6
-rw-r--r--test/pending/neg/plugin-rightafter-terminal/src/ThePlugin.scala8
-rw-r--r--test/pending/neg/t0653.scala8
-rw-r--r--test/pending/neg/t2080.scala2
-rw-r--r--test/pending/neg/t3152.scala4
-rw-r--r--test/pending/neg/t963.scala4
-rw-r--r--test/pending/neg/tcpoly_typealias_eta.scala6
-rw-r--r--test/pending/neg/tcpoly_variance_enforce_getter_setter.scala4
-rw-r--r--test/pending/neg/type-diagnostics.scala2
13 files changed, 36 insertions, 36 deletions
diff --git a/test/pending/neg/plugin-after-terminal/src/ThePlugin.scala b/test/pending/neg/plugin-after-terminal/src/ThePlugin.scala
index f3c913086e..2a4607392f 100644
--- a/test/pending/neg/plugin-after-terminal/src/ThePlugin.scala
+++ b/test/pending/neg/plugin-after-terminal/src/ThePlugin.scala
@@ -12,7 +12,7 @@ class ThePlugin(val global: Global) extends Plugin {
val name = "afterterminal"
val description = "Declares one plugin that wants to be after the terminal phase"
val components = List[PluginComponent](thePhase)
-
+
private object thePhase extends PluginComponent {
val global = ThePlugin.this.global
@@ -20,9 +20,9 @@ class ThePlugin(val global: Global) extends Plugin {
val phaseName = ThePlugin.this.name
- def newPhase(prev: Phase) = new ThePhase(prev)
+ def newPhase(prev: Phase) = new ThePhase(prev)
}
-
+
private class ThePhase(prev: Phase) extends Phase(prev) {
def name = ThePlugin.this.name
def run {}
diff --git a/test/pending/neg/plugin-before-parser/src/ThePlugin.scala b/test/pending/neg/plugin-before-parser/src/ThePlugin.scala
index 8714a55dc4..7ca896650d 100644
--- a/test/pending/neg/plugin-before-parser/src/ThePlugin.scala
+++ b/test/pending/neg/plugin-before-parser/src/ThePlugin.scala
@@ -12,7 +12,7 @@ class ThePlugin(val global: Global) extends Plugin {
val name = "beforeparser"
val description = "Declares one plugin that wants to be before the parser phase"
val components = List[PluginComponent](thePhase)
-
+
private object thePhase extends PluginComponent {
val global = ThePlugin.this.global
@@ -21,9 +21,9 @@ class ThePlugin(val global: Global) extends Plugin {
val phaseName = ThePlugin.this.name
- def newPhase(prev: Phase) = new ThePhase(prev)
+ def newPhase(prev: Phase) = new ThePhase(prev)
}
-
+
private class ThePhase(prev: Phase) extends Phase(prev) {
def name = ThePlugin.this.name
def run {}
diff --git a/test/pending/neg/plugin-cyclic-dependency/src/ThePlugin.scala b/test/pending/neg/plugin-cyclic-dependency/src/ThePlugin.scala
index 1dfc15cb28..bd94ce60d7 100644
--- a/test/pending/neg/plugin-cyclic-dependency/src/ThePlugin.scala
+++ b/test/pending/neg/plugin-cyclic-dependency/src/ThePlugin.scala
@@ -12,7 +12,7 @@ class ThePlugin(val global: Global) extends Plugin {
val name = "cyclicdependency"
val description = "Declares two phases that have a cyclic dependency"
val components = List[PluginComponent](thePhase1,thePhase2)
-
+
private object thePhase1 extends PluginComponent {
val global = ThePlugin.this.global
@@ -20,9 +20,9 @@ class ThePlugin(val global: Global) extends Plugin {
val phaseName = ThePlugin.this.name + "1"
- def newPhase(prev: Phase) = new ThePhase(prev)
+ def newPhase(prev: Phase) = new ThePhase(prev)
}
-
+
private object thePhase2 extends PluginComponent {
val global = ThePlugin.this.global
@@ -30,9 +30,9 @@ class ThePlugin(val global: Global) extends Plugin {
val phaseName = ThePlugin.this.name + "2"
- def newPhase(prev: Phase) = new ThePhase(prev)
+ def newPhase(prev: Phase) = new ThePhase(prev)
}
-
+
private class ThePhase(prev: Phase) extends Phase(prev) {
def name = ThePlugin.this.name
def run {}
diff --git a/test/pending/neg/plugin-multiple-rafter/src/ThePlugin.scala b/test/pending/neg/plugin-multiple-rafter/src/ThePlugin.scala
index 4c761517c1..819176fa88 100644
--- a/test/pending/neg/plugin-multiple-rafter/src/ThePlugin.scala
+++ b/test/pending/neg/plugin-multiple-rafter/src/ThePlugin.scala
@@ -12,7 +12,7 @@ class ThePlugin(val global: Global) extends Plugin {
val name = "multi-rafter"
val description = ""
val components = List[PluginComponent](thePhase)
-
+
private object thePhase extends PluginComponent {
val global = ThePlugin.this.global
@@ -20,9 +20,9 @@ class ThePlugin(val global: Global) extends Plugin {
override val runsRightAfter = Some("explicitouter")
val phaseName = ThePlugin.this.name
- def newPhase(prev: Phase) = new ThePhase(prev)
+ def newPhase(prev: Phase) = new ThePhase(prev)
}
-
+
private class ThePhase(prev: Phase) extends Phase(prev) {
def name = ThePlugin.this.name
def run {}
diff --git a/test/pending/neg/plugin-rafter-before-1/src/ThePlugin.scala b/test/pending/neg/plugin-rafter-before-1/src/ThePlugin.scala
index c42a914066..81ba85ae80 100644
--- a/test/pending/neg/plugin-rafter-before-1/src/ThePlugin.scala
+++ b/test/pending/neg/plugin-rafter-before-1/src/ThePlugin.scala
@@ -12,7 +12,7 @@ class ThePlugin(val global: Global) extends Plugin {
val name = "rafter-before-1"
val description = ""
val components = List[PluginComponent](thePhase1)
-
+
private object thePhase1 extends PluginComponent {
val global = ThePlugin.this.global
@@ -20,9 +20,9 @@ class ThePlugin(val global: Global) extends Plugin {
override val runsBefore = List[String]("erasure")
val phaseName = ThePlugin.this.name
- def newPhase(prev: Phase) = new ThePhase(prev)
+ def newPhase(prev: Phase) = new ThePhase(prev)
}
-
+
private class ThePhase(prev: Phase) extends Phase(prev) {
def name = ThePlugin.this.name
def run {}
diff --git a/test/pending/neg/plugin-rightafter-terminal/src/ThePlugin.scala b/test/pending/neg/plugin-rightafter-terminal/src/ThePlugin.scala
index 47dd06ec8a..9d6d30b327 100644
--- a/test/pending/neg/plugin-rightafter-terminal/src/ThePlugin.scala
+++ b/test/pending/neg/plugin-rightafter-terminal/src/ThePlugin.scala
@@ -12,18 +12,18 @@ class ThePlugin(val global: Global) extends Plugin {
val name = "rightafterterminal"
val description = "Declares one plugin that wants to be right after the terminal phase"
val components = List[PluginComponent](thePhase)
-
+
private object thePhase extends PluginComponent {
val global = ThePlugin.this.global
val runsAfter = List[String]()
override val runsRightAfter = Some("terminal")
-
+
val phaseName = ThePlugin.this.name
- def newPhase(prev: Phase) = new ThePhase(prev)
+ def newPhase(prev: Phase) = new ThePhase(prev)
}
-
+
private class ThePhase(prev: Phase) extends Phase(prev) {
def name = ThePlugin.this.name
def run {}
diff --git a/test/pending/neg/t0653.scala b/test/pending/neg/t0653.scala
index 48f39447ba..26204a8b40 100644
--- a/test/pending/neg/t0653.scala
+++ b/test/pending/neg/t0653.scala
@@ -7,11 +7,11 @@ class Fix[Op[A]](x : Op[Fix[Op]])
class FixTest {
// works
// val zero = new Fix[One](new One)
-
+
// don't work:
val two = new Fix(new Two) // this was what I found here
val zero = new Fix(new One) // this seems like something which could plausibly work
-
+
// neg/t0653.scala:12: error: no type parameters for constructor Fix: (x: Op[Fix[Op[A]]])Fix[Op[A]] exist so that it can be applied to arguments (Two[Nothing,Nothing])
// --- because ---
// argument expression's type is not compatible with formal parameter type;
@@ -24,7 +24,7 @@ class FixTest {
// argument expression's type is not compatible with formal parameter type;
// found : One[Nothing]
// required: ?Op[ Fix[?Op[ A ]] ]
- // val zero = new Fix(new One) // this seems like something which could plausibly work
+ // val zero = new Fix(new One) // this seems like something which could plausibly work
// ^
- // two errors found
+ // two errors found
}
diff --git a/test/pending/neg/t2080.scala b/test/pending/neg/t2080.scala
index 0880a40faa..3f4306c091 100644
--- a/test/pending/neg/t2080.scala
+++ b/test/pending/neg/t2080.scala
@@ -14,4 +14,4 @@ object C extends B {
}
override def f(x : T) : T = { x.g; x }
}
-//It compiles without errors, but T in B and T in C are completely unrelated types.
+//It compiles without errors, but T in B and T in C are completely unrelated types.
diff --git a/test/pending/neg/t3152.scala b/test/pending/neg/t3152.scala
index 27a314c484..3abc772076 100644
--- a/test/pending/neg/t3152.scala
+++ b/test/pending/neg/t3152.scala
@@ -3,6 +3,6 @@ package test
object NotEnclosing {
def main(args : Array[String]) : Unit = {}
def compare[T](x: Ordered[T], y: Ordered[T]) = error("")
- def mkEx: Ordered[_] = error("")
- compare(mkEx, mkEx)
+ def mkEx: Ordered[_] = error("")
+ compare(mkEx, mkEx)
}
diff --git a/test/pending/neg/t963.scala b/test/pending/neg/t963.scala
index 430ef090e4..3be0be1b84 100644
--- a/test/pending/neg/t963.scala
+++ b/test/pending/neg/t963.scala
@@ -5,8 +5,8 @@ trait A {
}
object B {
- def f(x : { val y : A }) { x.y.v = x.y.v }
-
+ def f(x : { val y : A }) { x.y.v = x.y.v }
+
var a : A = _
var b : Boolean = false
def y : A = {
diff --git a/test/pending/neg/tcpoly_typealias_eta.scala b/test/pending/neg/tcpoly_typealias_eta.scala
index 0fb2c2d33e..033c911f7c 100644
--- a/test/pending/neg/tcpoly_typealias_eta.scala
+++ b/test/pending/neg/tcpoly_typealias_eta.scala
@@ -12,7 +12,7 @@ trait A3 {
trait FooCov[+x]
trait FooCon[-x]
-trait FooBound[+x <: String]
+trait FooBound[+x <: String]
trait BOk1 extends A {
type m/*[+x]*/ = FooCov/*[x]*/
@@ -30,8 +30,8 @@ trait BOk4 extends A3 {
type m/*[+x]*/ = FooCov/*[x]*/ // weaker variance
}
-// there are two aspects to check:
- // does type alias signature (not considering RHS) correspond to abstract type member in super class
+// there are two aspects to check:
+ // does type alias signature (not considering RHS) correspond to abstract type member in super class
// does RHS correspond to the type alias sig
trait BInv extends A{
type m/*[x]*/ = FooCov/*[x]*/ // error: invariant x in alias def
diff --git a/test/pending/neg/tcpoly_variance_enforce_getter_setter.scala b/test/pending/neg/tcpoly_variance_enforce_getter_setter.scala
index 321d392cc4..deafba8d8a 100644
--- a/test/pending/neg/tcpoly_variance_enforce_getter_setter.scala
+++ b/test/pending/neg/tcpoly_variance_enforce_getter_setter.scala
@@ -1,12 +1,12 @@
trait coll[+m[+x]]
-class FooInvar[x]
+class FooInvar[x]
class FooContra[-x]
class FooCov[+x]
object test {
var ok: coll[FooCov] = _
-
+
var x: coll[FooInvar] = _ // TODO: error should be reported only once instead of separately for getter and setter
var y: coll[FooContra] = _
}
diff --git a/test/pending/neg/type-diagnostics.scala b/test/pending/neg/type-diagnostics.scala
index 7f9a151dcd..a3a9172bb2 100644
--- a/test/pending/neg/type-diagnostics.scala
+++ b/test/pending/neg/type-diagnostics.scala
@@ -7,5 +7,5 @@ object TooManyParens {
// Unspecified value parameter elem.
// def f = Map(1 -> 2).keySet()
// ^
-
+
}