From 94b3dc83c44ed843a3aae67abf2b877669e63fe0 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 5 Apr 2012 10:24:15 +0200 Subject: avoid field init prob: make NoTreeAnnotation a def --- src/compiler/scala/reflect/runtime/Universe.scala | 2 +- src/compiler/scala/tools/nsc/symtab/Positions.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler') 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 = { -- cgit v1.2.3