summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2006-12-05 18:54:47 +0000
committerMartin Odersky <odersky@gmail.com>2006-12-05 18:54:47 +0000
commit80eb08f5a1de98ebbec0e989928d665c7061c07c (patch)
tree5378d7450b2d1b30cc684bc370e6c544d706152f
parent52bb1b64dbd32c3611d3c81c87e2197c8d99079a (diff)
downloadscala-80eb08f5a1de98ebbec0e989928d665c7061c07c.tar.gz
scala-80eb08f5a1de98ebbec0e989928d665c7061c07c.tar.bz2
scala-80eb08f5a1de98ebbec0e989928d665c7061c07c.zip
updated test files to avoid illegal null assign...
updated test files to avoid illegal null assignments
-rw-r--r--test/files/neg/bug576.scala2
-rw-r--r--test/files/neg/bug591.scala4
-rw-r--r--test/files/neg/bug712.scala2
-rw-r--r--test/files/pos/bug788.scala1
4 files changed, 4 insertions, 5 deletions
diff --git a/test/files/neg/bug576.scala b/test/files/neg/bug576.scala
index 2d9cf01910..fd83217a45 100644
--- a/test/files/neg/bug576.scala
+++ b/test/files/neg/bug576.scala
@@ -9,7 +9,7 @@ trait PriorityTreeXXX extends BaseListXXX {
type Node <: BasicTreeNode;
trait BasicTreeNode extends BaseNode {
- def sibling: Node = null;
+ def sibling: Node;
def insert(dir : Int, node : Node) = {
if (true) sibling.insert(node);
//else insert(node);
diff --git a/test/files/neg/bug591.scala b/test/files/neg/bug591.scala
index 94d8068bb3..0f0b02395c 100644
--- a/test/files/neg/bug591.scala
+++ b/test/files/neg/bug591.scala
@@ -32,8 +32,8 @@ trait BaseFlow extends BaseList {
}
trait BFNode extends BaseNode {
- private var input : Input = null;
- private var output : Output = null;
+ private var input : Input = _;
+ private var output : Output = _;
def input_=(in : Input) = {}
diff --git a/test/files/neg/bug712.scala b/test/files/neg/bug712.scala
index 0887810c85..6f2627743f 100644
--- a/test/files/neg/bug712.scala
+++ b/test/files/neg/bug712.scala
@@ -14,6 +14,6 @@ trait B extends A {
def scope : Int;
}
implicit def coerceSym(sym : Symbol) : SymbolImpl;
- var s : Symbol = null;
+ var s : Symbol = _;
val s_scope = s.scope;
}
diff --git a/test/files/pos/bug788.scala b/test/files/pos/bug788.scala
index 23ffa4a52d..19638dd170 100644
--- a/test/files/pos/bug788.scala
+++ b/test/files/pos/bug788.scala
@@ -14,7 +14,6 @@ trait Test {
def asExpression(e : ExpressionImpl) : Named = {
e match {
case f : NamedImpl => f.self;
- case _ => null;
}
}
}