From fe65f9275a908de09aa051c8699de29ffeb413d9 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Sat, 24 Nov 2012 14:51:26 +0100
Subject: Tiny aesthetic refactorings.

---
 src/main/scala/scala/async/Async.scala       |  4 ++--
 src/main/scala/scala/async/ExprBuilder.scala | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index 473b948..4c5c8f2 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -98,7 +98,7 @@ abstract class AsyncBase {
     val endState = Int.MaxValue
 
     val asyncBlockBuilder = new builder.AsyncBlockBuilder(anfTree.stats, anfTree.expr, startState, endState, renameMap)
-    val handlerCases: List[CaseDef] = asyncBlockBuilder.mkCombinedHandlerCases[T]()
+    val handlerCases: List[CaseDef] = asyncBlockBuilder.mkCombinedHandlerCases[T]
 
     import asyncBlockBuilder.asyncStates
     logDiagnostics(c)(anfTree, asyncStates.map(_.toString))
@@ -118,7 +118,7 @@ abstract class AsyncBase {
         ...
      */
     val onCompleteHandler = {
-      val onCompleteHandlers = initStates.flatMap(_.mkOnCompleteHandler()).toList
+      val onCompleteHandlers = initStates.flatMap(_.mkOnCompleteHandler).toList
       Function(
         List(ValDef(Modifiers(PARAM), name.tr, TypeTree(defn.TryAnyType), EmptyTree)),
         Match(Ident(name.state), onCompleteHandlers))
diff --git a/src/main/scala/scala/async/ExprBuilder.scala b/src/main/scala/scala/async/ExprBuilder.scala
index a269740..00b06b1 100644
--- a/src/main/scala/scala/async/ExprBuilder.scala
+++ b/src/main/scala/scala/async/ExprBuilder.scala
@@ -27,9 +27,9 @@ private[async] final case class ExprBuilder[C <: Context, FS <: FutureSystem](va
   trait AsyncState {
     def state: Int
 
-    def mkHandlerCaseForState(): CaseDef
+    def mkHandlerCaseForState: CaseDef
 
-    def mkOnCompleteHandler(): Option[CaseDef] = None
+    def mkOnCompleteHandler: Option[CaseDef] = None
 
     def stats: List[Tree]
 
@@ -43,7 +43,7 @@ private[async] final case class ExprBuilder[C <: Context, FS <: FutureSystem](va
   final class SimpleAsyncState(val stats: List[Tree], val state: Int, nextState: Int)
     extends AsyncState {
 
-    def mkHandlerCaseForState(): CaseDef =
+    def mkHandlerCaseForState: CaseDef =
       mkHandlerCase(state, stats :+ mkStateTree(nextState) :+ mkResumeApply)
 
     override val toString: String =
@@ -54,7 +54,7 @@ private[async] final case class ExprBuilder[C <: Context, FS <: FutureSystem](va
     * a branch of an `if` or a `match`.
     */
   final class AsyncStateWithoutAwait(val stats: List[c.Tree], val state: Int) extends AsyncState {
-    override def mkHandlerCaseForState(): CaseDef =
+    override def mkHandlerCaseForState: CaseDef =
       mkHandlerCase(state, stats)
 
     override val toString: String =
@@ -68,12 +68,13 @@ private[async] final case class ExprBuilder[C <: Context, FS <: FutureSystem](va
                                   awaitable: Awaitable)
     extends AsyncState {
 
-    override def mkHandlerCaseForState(): CaseDef = {
-      val callOnComplete = futureSystemOps.onComplete(c.Expr(awaitable.expr), c.Expr(Ident(name.onCompleteHandler)), c.Expr(Ident(name.execContext))).tree
+    override def mkHandlerCaseForState: CaseDef = {
+      val callOnComplete = futureSystemOps.onComplete(c.Expr(awaitable.expr),
+        c.Expr(Ident(name.onCompleteHandler)), c.Expr(Ident(name.execContext))).tree
       mkHandlerCase(state, stats :+ callOnComplete)
     }
 
-    override def mkOnCompleteHandler(): Option[CaseDef] = {
+    override def mkOnCompleteHandler: Option[CaseDef] = {
       val tryGetTree =
         Assign(
           Ident(awaitable.resultName),
@@ -90,8 +91,6 @@ private[async] final case class ExprBuilder[C <: Context, FS <: FutureSystem](va
    * Builder for a single state of an async method.
    */
   final class AsyncStateBuilder(state: Int, private val nameMap: Map[Symbol, c.Name]) {
-    self =>
-
     /* Statements preceding an await call. */
     private val stats = ListBuffer[c.Tree]()
     /** The state of the target of a LabelDef application (while loop jump) */
@@ -264,18 +263,19 @@ private[async] final case class ExprBuilder[C <: Context, FS <: FutureSystem](va
     val lastState = stateBuilder.resultSimple(endState)
     asyncStates += lastState
 
-    def mkCombinedHandlerCases[T](): List[CaseDef] = {
+    def mkCombinedHandlerCases[T]: List[CaseDef] = {
       val caseForLastState: CaseDef = {
         val lastState = asyncStates.last
         val lastStateBody = c.Expr[T](lastState.body)
-        val rhs = futureSystemOps.completeProm(c.Expr[futureSystem.Prom[T]](Ident(name.result)), reify(scala.util.Success(lastStateBody.splice)))
+        val rhs = futureSystemOps.completeProm(
+          c.Expr[futureSystem.Prom[T]](Ident(name.result)), reify(scala.util.Success(lastStateBody.splice)))
         mkHandlerCase(lastState.state, rhs.tree)
       }
       asyncStates.toList match {
         case s :: Nil =>
           List(caseForLastState)
         case _        =>
-          val initCases = for (state <- asyncStates.toList.init) yield state.mkHandlerCaseForState()
+          val initCases = for (state <- asyncStates.toList.init) yield state.mkHandlerCaseForState
           initCases :+ caseForLastState
       }
     }
-- 
cgit v1.2.3