diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-08-19 16:19:03 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-08-19 16:19:03 +0200 |
| commit | 62131749d08657a0103c922c626a0b918cf385b5 (patch) | |
| tree | e8c49a9bb6eb41f3f5d4e3ca7e75a431a25c33b9 /src/dotty/tools/dotc/util | |
| parent | edb9facac55f61540e0f9af8d06ac9390830fcb8 (diff) | |
| download | dotty-62131749d08657a0103c922c626a0b918cf385b5.tar.gz dotty-62131749d08657a0103c922c626a0b918cf385b5.tar.bz2 dotty-62131749d08657a0103c922c626a0b918cf385b5.zip | |
Several fixes and refactorings for typechecking
1) Refactoring of package loaders that ensures that a package is always loaded before new members are entered. This led to a refactoring of sourceModule in completers into its own trait
2) Refactoring of optSelfType ot selfInfo. Class Infos may now have a reference to a symbol in their selfInfo field, instead of always a type, as it was before. This allows to introduce laziness for self type evaluation. Laziness is needed so that modules can be desugared and the desugared version be compiled without special tricks.
3) <init> and $init members are no longer inherited.
4) Refactoring of createSymbol and enterSym, so that creating symbols and entering them in a scope is decoupled.
Renamed the driver operation form `enterSym(s)` to `index`.
Diffstat (limited to 'src/dotty/tools/dotc/util')
| -rw-r--r-- | src/dotty/tools/dotc/util/Positions.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/dotty/tools/dotc/util/Positions.scala b/src/dotty/tools/dotc/util/Positions.scala index 281540321..334a3deb6 100644 --- a/src/dotty/tools/dotc/util/Positions.scala +++ b/src/dotty/tools/dotc/util/Positions.scala @@ -49,6 +49,9 @@ object Positions { def pointDelta = (coords >>> (StartEndBits * 2)).toInt + def orElse(that: Position) = + if (this.exists) this else that + /** The union of two positions. This is the least range that encloses * both positions. It is always a synthetic position. */ |