From 75ac4010609c7d3ac856523d8f2d59e710a4c58c Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Mon, 26 Oct 2015 09:36:59 +0100
Subject: Shorten ctx.typerState.reporter to ctx.reporter

... making use of method in `ctx`.
---
 src/dotty/tools/dotc/Driver.scala                | 2 +-
 src/dotty/tools/dotc/Resident.scala              | 2 +-
 src/dotty/tools/dotc/Run.scala                   | 2 +-
 src/dotty/tools/dotc/transform/TreeChecker.scala | 2 +-
 src/dotty/tools/dotc/typer/Applications.scala    | 2 +-
 src/dotty/tools/dotc/typer/Implicits.scala       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/dotty/tools/dotc/Driver.scala b/src/dotty/tools/dotc/Driver.scala
index 7e9d4a5e4..92a2ed1a2 100644
--- a/src/dotty/tools/dotc/Driver.scala
+++ b/src/dotty/tools/dotc/Driver.scala
@@ -24,7 +24,7 @@ abstract class Driver extends DotClass {
       catch {
         case ex: FatalError  =>
           ctx.error(ex.getMessage) // signals that we should fail compilation.
-          ctx.typerState.reporter
+          ctx.reporter
       }
     else emptyReporter
 
diff --git a/src/dotty/tools/dotc/Resident.scala b/src/dotty/tools/dotc/Resident.scala
index 9578e7d2c..3ae369f27 100644
--- a/src/dotty/tools/dotc/Resident.scala
+++ b/src/dotty/tools/dotc/Resident.scala
@@ -47,7 +47,7 @@ class Resident extends Driver {
         nextCtx = rootCtx
         line = getLine()
       }
-      if (line.startsWith(quit)) ctx.typerState.reporter
+      if (line.startsWith(quit)) ctx.reporter
       else loop(line split "\\s+", nextCtx)
     }
     loop(args, rootCtx)
diff --git a/src/dotty/tools/dotc/Run.scala b/src/dotty/tools/dotc/Run.scala
index 553805d95..114f994be 100644
--- a/src/dotty/tools/dotc/Run.scala
+++ b/src/dotty/tools/dotc/Run.scala
@@ -84,7 +84,7 @@ class Run(comp: Compiler)(implicit ctx: Context) {
   /** Print summary; return # of errors encountered */
   def printSummary(): Reporter = {
     ctx.runInfo.printMaxConstraint()
-    val r = ctx.typerState.reporter
+    val r = ctx.reporter
     r.printSummary
     r
   }
diff --git a/src/dotty/tools/dotc/transform/TreeChecker.scala b/src/dotty/tools/dotc/transform/TreeChecker.scala
index 2296ae658..1f47b4486 100644
--- a/src/dotty/tools/dotc/transform/TreeChecker.scala
+++ b/src/dotty/tools/dotc/transform/TreeChecker.scala
@@ -118,7 +118,7 @@ class TreeChecker extends Phase with SymTransformer {
     val squahsedPhase = ctx.squashed(prevPhase)
     ctx.println(s"checking ${ctx.compilationUnit} after phase ${squahsedPhase}")
     val checkingCtx = ctx.fresh
-      .setTyperState(ctx.typerState.withReporter(new ThrowingReporter(ctx.typerState.reporter)))
+      .setTyperState(ctx.typerState.withReporter(new ThrowingReporter(ctx.reporter)))
     val checker = new Checker(previousPhases(phasesToRun.toList)(ctx))
     try checker.typedExpr(ctx.compilationUnit.tpdTree)(checkingCtx)
     catch {
diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala
index 87ad0831c..0fee17bcd 100644
--- a/src/dotty/tools/dotc/typer/Applications.scala
+++ b/src/dotty/tools/dotc/typer/Applications.scala
@@ -153,7 +153,7 @@ trait Applications extends Compatibility { self: Typer =>
 
     def ok = _ok
     def ok_=(x: Boolean) = {
-      assert(x || ctx.errorsReported || !ctx.typerState.isCommittable) // !!! DEBUG
+      assert(x || ctx.reporter.errorsReported || !ctx.typerState.isCommittable) // !!! DEBUG
       _ok = x
     }
 
diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/src/dotty/tools/dotc/typer/Implicits.scala
index 5444dddb0..e3626fe20 100644
--- a/src/dotty/tools/dotc/typer/Implicits.scala
+++ b/src/dotty/tools/dotc/typer/Implicits.scala
@@ -495,7 +495,7 @@ trait Implicits { self: Typer =>
               case _ => false
             }
           }
-        if (ctx.typerState.reporter.hasErrors)
+        if (ctx.reporter.hasErrors)
           nonMatchingImplicit(ref)
         else if (contextual && !ctx.mode.is(Mode.ImplicitShadowing) &&
                  !shadowing.tpe.isError && !refMatches(shadowing)) {
-- 
cgit v1.2.3