diff options
| author | Paul Phillips <paulp@improving.org> | 2009-02-26 22:24:35 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-02-26 22:24:35 +0000 |
| commit | 0e495b0aba6c984ca0157e7d3c2be29e5560bb04 (patch) | |
| tree | 2557fd0a40163b39ce438ab013c18a09857f00fb | |
| parent | 5d802d95ce759ab6cd183b0f1e143c4ff3599207 (diff) | |
| download | scala-0e495b0aba6c984ca0157e7d3c2be29e5560bb04.tar.gz scala-0e495b0aba6c984ca0157e7d3c2be29e5560bb04.tar.bz2 scala-0e495b0aba6c984ca0157e7d3c2be29e5560bb04.zip | |
Reverting last commit as it seems to have cause...
Reverting last commit as it seems to have caused breakage.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 5 | ||||
| -rw-r--r-- | test/files/neg/bug1392.check | 4 | ||||
| -rw-r--r-- | test/files/neg/bug1392.scala | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 427a299d51..9518f62c37 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -572,16 +572,13 @@ trait Typers { self: Analyzer => * </ol> */ private def stabilize(tree: Tree, pre: Type, mode: Int, pt: Type): Tree = { - def isNotAValue(sym: Symbol) = // bug #1392 - !sym.isValue || (sym.isModule && isValueClass(sym.linkedClassOfModule)) - if (tree.symbol.hasFlag(OVERLOADED) && (mode & FUNmode) == 0) inferExprAlternative(tree, pt) val sym = tree.symbol if (tree.tpe.isError) tree else if ((mode & (PATTERNmode | FUNmode)) == PATTERNmode && tree.isTerm) { // (1) checkStable(tree) - } else if ((mode & (EXPRmode | QUALmode)) == EXPRmode && isNotAValue(sym) && !phase.erasedTypes) { // (2) + } else if ((mode & (EXPRmode | QUALmode)) == EXPRmode && !sym.isValue && !phase.erasedTypes) { // (2) errorTree(tree, sym+" is not a value") } else { if (sym.isStable && pre.isStable && tree.tpe.typeSymbol != ByNameParamClass && diff --git a/test/files/neg/bug1392.check b/test/files/neg/bug1392.check deleted file mode 100644 index e4c9630435..0000000000 --- a/test/files/neg/bug1392.check +++ /dev/null @@ -1,4 +0,0 @@ -bug1392.scala:1: error: object Int is not a value -object X extends Application { Int } - ^ -one error found diff --git a/test/files/neg/bug1392.scala b/test/files/neg/bug1392.scala deleted file mode 100644 index bb23818038..0000000000 --- a/test/files/neg/bug1392.scala +++ /dev/null @@ -1 +0,0 @@ -object X extends Application { Int }
\ No newline at end of file |