diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-05 22:58:46 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-05 22:58:46 -0700 |
| commit | ea39db73654d46c6383ea1c4b4b2b16a45ac14d8 (patch) | |
| tree | eae1d3e89f5d8903da6437a8fa14325638d591b8 /src/compiler | |
| parent | 9ccfce6bbc750dd03c11b0694a3cdc8ad51d7288 (diff) | |
| parent | 94b3dc83c44ed843a3aae67abf2b877669e63fe0 (diff) | |
| download | scala-ea39db73654d46c6383ea1c4b4b2b16a45ac14d8.tar.gz scala-ea39db73654d46c6383ea1c4b4b2b16a45ac14d8.tar.bz2 scala-ea39db73654d46c6383ea1c4b4b2b16a45ac14d8.zip | |
Merge commit 'refs/pull/355/head^'
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/reflect/runtime/Universe.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Positions.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/runtime/Universe.scala b/src/compiler/scala/reflect/runtime/Universe.scala index 7a5dda3d8e..dca6d6041b 100644 --- a/src/compiler/scala/reflect/runtime/Universe.scala +++ b/src/compiler/scala/reflect/runtime/Universe.scala @@ -40,7 +40,7 @@ class Universe extends SymbolTable { definitions.AnyValClass // force it. type TreeAnnotation = Position - val NoTreeAnnotation: TreeAnnotation = NoPosition + def NoTreeAnnotation: TreeAnnotation = NoPosition def positionToAnnotation(pos: Position): TreeAnnotation = pos // TODO def annotationToPosition(annot: TreeAnnotation): Position = annot //TODO diff --git a/src/compiler/scala/tools/nsc/symtab/Positions.scala b/src/compiler/scala/tools/nsc/symtab/Positions.scala index 680b06f8ce..94b619de90 100644 --- a/src/compiler/scala/tools/nsc/symtab/Positions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Positions.scala @@ -15,7 +15,7 @@ self: scala.tools.nsc.symtab.SymbolTable => val NoPosition = scala.tools.nsc.util.NoPosition type TreeAnnotation = scala.tools.nsc.util.TreeAnnotation - val NoTreeAnnotation: TreeAnnotation = NoPosition + def NoTreeAnnotation: TreeAnnotation = NoPosition def positionToAnnotation(pos: Position): TreeAnnotation = pos def annotationToPosition(annot: TreeAnnotation): Position = annot.pos override def _checkSetAnnotation(tree: Tree, annot: TreeAnnotation): Unit = { |