diff options
| author | Paul Phillips <paulp@improving.org> | 2013-05-18 10:32:06 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-18 10:56:57 -0700 |
| commit | 2b5e60e8b357b93664706e14437ae954315263e0 (patch) | |
| tree | bf11f0a7d330d44c73dd18b5f816d4b86647c19a /src/compiler/scala/tools/nsc/typechecker/Duplicators.scala | |
| parent | 01dec25425cefb6acc147d8341893eb70ca76245 (diff) | |
| parent | d93826f278b2ee8be3c4092bf800c2156d35d692 (diff) | |
| download | scala-2b5e60e8b357b93664706e14437ae954315263e0.tar.gz scala-2b5e60e8b357b93664706e14437ae954315263e0.tar.bz2 scala-2b5e60e8b357b93664706e14437ae954315263e0.zip | |
Merge commit 'd93826f278' into pr/enter-elimination-mode
* commit 'd93826f278':
Incorporated reviewer feedback.
Incorporated reviewer feedback.
Refactored stabilize.
Eliminated HKmode.
Eliminated RETmode.
Eliminated SNDTRYmode.
Started eliminating modes.
Corralling Modes into a smaller pen.
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Macros.scala
src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Duplicators.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Duplicators.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala index b9e4b4f591..aa05c97c08 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala @@ -331,7 +331,7 @@ abstract class Duplicators extends Analyzer { super.typed(atPos(tree.pos)(tree1)) */ case Match(scrut, cases) => - val scrut1 = typed(scrut, EXPRmode | BYVALmode, WildcardType) + val scrut1 = typedByValueExpr(scrut) val scrutTpe = scrut1.tpe.widen val cases1 = { if (scrutTpe.isFinalType) cases filter { |