diff options
author | Paul Phillips <paulp@improving.org> | 2012-01-05 08:41:09 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-01-05 13:35:16 -0800 |
commit | 97020945efb0b9d7eebebedce757548349c94537 (patch) | |
tree | 8afb7c1a5e9c2b866df2e8ea7641fe4fed1c2efe | |
parent | 64107de6cba37f796bd7c6b86509cefba312f91d (diff) | |
download | scala-97020945efb0b9d7eebebedce757548349c94537.tar.gz scala-97020945efb0b9d7eebebedce757548349c94537.tar.bz2 scala-97020945efb0b9d7eebebedce757548349c94537.zip |
Moved Origins into scala.reflect.internal.util.
It's too handy and I can't reach it from key classes whose
calls I want to profile.
-rw-r--r-- | src/compiler/scala/reflect/internal/util/Origins.scala (renamed from src/compiler/scala/tools/nsc/util/Origins.scala) | 16 | ||||
-rw-r--r-- | test/files/run/origins.scala | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/util/Origins.scala b/src/compiler/scala/reflect/internal/util/Origins.scala index f8ba34ae3c..b9985c8f50 100644 --- a/src/compiler/scala/tools/nsc/util/Origins.scala +++ b/src/compiler/scala/reflect/internal/util/Origins.scala @@ -3,10 +3,12 @@ * @author Paul Phillips */ -package scala.tools.nsc -package util +package scala.reflect +package internal.util -import scala.reflect.NameTransformer._ +import NameTransformer._ +import scala.collection.{ mutable, immutable } +import Origins._ /** A debugging class for logging from whence a method is being called. * Say you wanted to discover who was calling phase_= in SymbolTable. @@ -33,10 +35,6 @@ import scala.reflect.NameTransformer._ }}} * */ - -import scala.collection.{ mutable, immutable } -import Origins._ - abstract class Origins { type Rep def newRep(xs: StackSlice): Rep @@ -94,7 +92,9 @@ object Origins { def apply(tag: String, clazz: Class[_]): Origins = apply(tag, new OneLine(clazz)) def apply(tag: String, orElse: => Origins): Origins = { counters find (_.tag == tag) getOrElse { - returning(orElse setTag tag)(counters += _) + val res = orElse setTag tag + counters += res + res } } diff --git a/test/files/run/origins.scala b/test/files/run/origins.scala index ab873bca89..9dc6071c7b 100644 --- a/test/files/run/origins.scala +++ b/test/files/run/origins.scala @@ -1,4 +1,4 @@ -import scala.tools.nsc.util.Origins +import scala.reflect.internal.util.Origins package goxbox { object Socks { |