diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-05-04 14:03:47 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-05-04 14:03:47 +0000 |
| commit | c4732915972ebe78d95a033350b176d7dbe75288 (patch) | |
| tree | c3eec593b4748f8e9e770df123adf9782b8e396f /src/compiler | |
| parent | 02ad6bb9666161e04e0b9ed3a8ffb6b0e2304596 (diff) | |
| download | scala-c4732915972ebe78d95a033350b176d7dbe75288.tar.gz scala-c4732915972ebe78d95a033350b176d7dbe75288.tar.bz2 scala-c4732915972ebe78d95a033350b176d7dbe75288.zip | |
sorry, last-minute edit broke build: re-added p...
sorry, last-minute edit broke build: re-added parens
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 862f9adaec..e503d721f9 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -541,12 +541,12 @@ self: Analyzer => } def comesBefore(sym: Symbol, owner: Symbol) = { val ownerPos = owner.pos.pointOrElse(Integer.MAX_VALUE) - sym.pos.pointOrElse(0) < ownerPos && + sym.pos.pointOrElse(0) < ownerPos && ( if(sym isGetterOrSetter) { val symAcc = sym.accessed // #3373 symAcc.pos.pointOrElse(0) < ownerPos && !(owner.ownerChain exists (o => (o eq sym) || (o eq symAcc))) // probably faster to iterate only once, don't feel like duplicating hasTransOwner for this case - } else !(owner hasTransOwner sym) // faster than owner.ownerChain contains sym + } else !(owner hasTransOwner sym)) // faster than owner.ownerChain contains sym } sym.isInitialized || |