summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-08-19 08:25:20 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-08-19 08:25:20 +0000
commit72cd46805c75ed3e58d5445c2ddc8d46bbd2111c (patch)
tree22d6f26f75cd4948bcdcf8ea952607f193ac64da /src
parente1bca64e9989ffcc72a02ccb41d4df575936040c (diff)
downloadscala-72cd46805c75ed3e58d5445c2ddc8d46bbd2111c.tar.gz
scala-72cd46805c75ed3e58d5445c2ddc8d46bbd2111c.tar.bz2
scala-72cd46805c75ed3e58d5445c2ddc8d46bbd2111c.zip
Fixed #1215.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 138d2f469d..529ec0444c 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -2634,8 +2634,10 @@ trait Typers { self: Analyzer =>
if (treeInfo.isVariableOrGetter(qual1)) {
convertToAssignment(fun, qual1, name, args, ex)
} else {
- if (qual1.symbol.isValue) error(tree.pos, "reassignment to val")
- else reportTypeError(fun.pos, ex)
+ if ((qual1.symbol ne null) && qual1.symbol.isValue)
+ error(tree.pos, "reassignment to val")
+ else
+ reportTypeError(fun.pos, ex)
setError(tree)
}
case _ =>