From b9fb76d09d0a6e63bfb6f332079ab7d05f1233ca Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 16 Jun 2010 22:14:52 +0000 Subject: The inliner now looks harder for method impleme... The inliner now looks harder for method implementations. In addition to the receiver, it will find those in directly mixed in traits and in superclasses. It still won't find those in traits mixed only into superclasses, as that didn't come quite so easily. Closes #3234 but I'll be opening up another ticket. Review by dragos. --- .../plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala | 1 + src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/continuations/plugin') diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala index 0c124c9c19..b9afcda3ec 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala @@ -14,6 +14,7 @@ abstract class CPSAnnotationChecker extends CPSUtils { import definitions._ //override val verbose = true + @inline override final def vprintln(x: =>Any): Unit = if (verbose) println(x) /** * Checks whether @cps annotations conform diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala index 57cba6e829..d1a35df04b 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala @@ -11,8 +11,7 @@ trait CPSUtils { var cpsEnabled = false val verbose: Boolean = System.getProperty("cpsVerbose", "false") == "true" - @inline final def vprintln(x: =>Any): Unit = if (verbose) println(x) - + def vprintln(x: =>Any): Unit = if (verbose) println(x) lazy val MarkerCPSSym = definitions.getClass("scala.util.continuations.cpsSym") lazy val MarkerCPSTypes = definitions.getClass("scala.util.continuations.cpsParam") -- cgit v1.2.3