From e11fc1677494dfeef004842dc728ca01898009ff Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Fri, 23 Sep 2016 10:01:07 +0200 Subject: Clean up config.Printers imports And remove the not used Printer#echo --- src/dotty/tools/dotc/ast/Desugar.scala | 1 - src/dotty/tools/dotc/ast/tpd.scala | 1 - src/dotty/tools/dotc/config/Printers.scala | 2 -- src/dotty/tools/dotc/core/CheckRealizable.scala | 1 - src/dotty/tools/dotc/core/Constraint.scala | 2 +- src/dotty/tools/dotc/core/ConstraintHandling.scala | 2 +- src/dotty/tools/dotc/core/ConstraintRunInfo.scala | 3 ++- src/dotty/tools/dotc/core/OrderingConstraint.scala | 1 - src/dotty/tools/dotc/core/Phases.scala | 2 +- src/dotty/tools/dotc/core/SymDenotations.scala | 2 +- src/dotty/tools/dotc/core/TypeApplications.scala | 2 +- src/dotty/tools/dotc/core/TypeComparer.scala | 2 +- src/dotty/tools/dotc/core/TypeOps.scala | 2 +- src/dotty/tools/dotc/core/Types.scala | 2 +- src/dotty/tools/dotc/reporting/StoreReporter.scala | 2 +- src/dotty/tools/dotc/transform/PostTyper.scala | 2 +- src/dotty/tools/dotc/typer/Applications.scala | 2 +- src/dotty/tools/dotc/typer/Checking.scala | 2 +- src/dotty/tools/dotc/typer/FrontEnd.scala | 2 +- src/dotty/tools/dotc/typer/Implicits.scala | 2 +- src/dotty/tools/dotc/typer/Inferencing.scala | 2 +- src/dotty/tools/dotc/typer/Namer.scala | 2 +- src/dotty/tools/dotc/typer/ProtoTypes.scala | 2 +- src/dotty/tools/dotc/typer/TypeAssigner.scala | 11 ++++++----- src/dotty/tools/dotc/typer/Typer.scala | 2 +- 25 files changed, 26 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/dotty/tools/dotc/ast/Desugar.scala b/src/dotty/tools/dotc/ast/Desugar.scala index 70d8f2d5e..eb68dd260 100644 --- a/src/dotty/tools/dotc/ast/Desugar.scala +++ b/src/dotty/tools/dotc/ast/Desugar.scala @@ -9,7 +9,6 @@ import Decorators._ import language.higherKinds import collection.mutable.ListBuffer import util.Attachment -import config.Printers._ object desugar { diff --git a/src/dotty/tools/dotc/ast/tpd.scala b/src/dotty/tools/dotc/ast/tpd.scala index 2b0e63a19..5fa787b8c 100644 --- a/src/dotty/tools/dotc/ast/tpd.scala +++ b/src/dotty/tools/dotc/ast/tpd.scala @@ -9,7 +9,6 @@ import core._ import util.Positions._, Types._, Contexts._, Constants._, Names._, Flags._ import SymDenotations._, Symbols._, StdNames._, Annotations._, Trees._, Symbols._ import Denotations._, Decorators._, DenotTransformers._ -import config.Printers._ import collection.mutable import typer.ErrorReporting._ diff --git a/src/dotty/tools/dotc/config/Printers.scala b/src/dotty/tools/dotc/config/Printers.scala index fa36ad12c..322bc82d9 100644 --- a/src/dotty/tools/dotc/config/Printers.scala +++ b/src/dotty/tools/dotc/config/Printers.scala @@ -4,12 +4,10 @@ object Printers { class Printer { def println(msg: => String): Unit = System.out.println(msg) - def echo[T](msg: => String, value: T): T = { println(msg + value); value } } object noPrinter extends Printer { override def println(msg: => String): Unit = () - override def echo[T](msg: => String, value: T): T = value } val default: Printer = new Printer diff --git a/src/dotty/tools/dotc/core/CheckRealizable.scala b/src/dotty/tools/dotc/core/CheckRealizable.scala index 11fd6786a..78ec685fc 100644 --- a/src/dotty/tools/dotc/core/CheckRealizable.scala +++ b/src/dotty/tools/dotc/core/CheckRealizable.scala @@ -4,7 +4,6 @@ package core import Contexts._, Types._, Symbols._, Names._, Flags._, Scopes._ import SymDenotations._, Denotations.SingleDenotation -import config.Printers._ import util.Positions._ import Decorators._ import StdNames._ diff --git a/src/dotty/tools/dotc/core/Constraint.scala b/src/dotty/tools/dotc/core/Constraint.scala index 99b4af0a9..91e70b7b5 100644 --- a/src/dotty/tools/dotc/core/Constraint.scala +++ b/src/dotty/tools/dotc/core/Constraint.scala @@ -8,7 +8,7 @@ import collection.mutable import printing.{Printer, Showable} import printing.Texts._ import config.Config -import config.Printers._ +import config.Printers.constr /** Constraint over undetermined type parameters. Constraints are built * over values of the following types: diff --git a/src/dotty/tools/dotc/core/ConstraintHandling.scala b/src/dotty/tools/dotc/core/ConstraintHandling.scala index 18e47a7f2..5911af72c 100644 --- a/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -5,7 +5,7 @@ package core import Types._, Contexts._, Symbols._ import Decorators._ import config.Config -import config.Printers._ +import config.Printers.{constr, typr} import TypeApplications.EtaExpansion import collection.mutable diff --git a/src/dotty/tools/dotc/core/ConstraintRunInfo.scala b/src/dotty/tools/dotc/core/ConstraintRunInfo.scala index 4b7e22653..e0f659cc6 100644 --- a/src/dotty/tools/dotc/core/ConstraintRunInfo.scala +++ b/src/dotty/tools/dotc/core/ConstraintRunInfo.scala @@ -1,7 +1,8 @@ package dotty.tools.dotc package core -import Contexts._, config.Printers._ +import Contexts._ +import config.Printers.typr trait ConstraintRunInfo { self: RunInfo => private var maxSize = 0 diff --git a/src/dotty/tools/dotc/core/OrderingConstraint.scala b/src/dotty/tools/dotc/core/OrderingConstraint.scala index e7e388be9..458f8b82f 100644 --- a/src/dotty/tools/dotc/core/OrderingConstraint.scala +++ b/src/dotty/tools/dotc/core/OrderingConstraint.scala @@ -8,7 +8,6 @@ import collection.mutable import printing.{Printer, Showable} import printing.Texts._ import config.Config -import config.Printers._ import collection.immutable.BitSet import reflect.ClassTag import annotation.tailrec diff --git a/src/dotty/tools/dotc/core/Phases.scala b/src/dotty/tools/dotc/core/Phases.scala index 4b2861452..222e2235d 100644 --- a/src/dotty/tools/dotc/core/Phases.scala +++ b/src/dotty/tools/dotc/core/Phases.scala @@ -9,7 +9,7 @@ import util.DotClass import DenotTransformers._ import Denotations._ import Decorators._ -import config.Printers._ +import config.Printers.config import scala.collection.mutable.{ListBuffer, ArrayBuffer} import dotty.tools.dotc.transform.TreeTransforms.{TreeTransformer, MiniPhase, TreeTransform} import dotty.tools.dotc.transform._ diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala index 47ec541ab..b6403c714 100644 --- a/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/src/dotty/tools/dotc/core/SymDenotations.scala @@ -16,7 +16,7 @@ import CheckRealizable._ import util.SimpleMap import util.Stats import config.Config -import config.Printers._ +import config.Printers.{completions, incremental, noPrinter} trait SymDenotations { this: Context => import SymDenotations._ diff --git a/src/dotty/tools/dotc/core/TypeApplications.scala b/src/dotty/tools/dotc/core/TypeApplications.scala index af362f4da..f32a591a6 100644 --- a/src/dotty/tools/dotc/core/TypeApplications.scala +++ b/src/dotty/tools/dotc/core/TypeApplications.scala @@ -13,7 +13,7 @@ import NameOps._ import Flags._ import StdNames.tpnme import util.Positions.Position -import config.Printers._ +import config.Printers.core import collection.mutable import dotty.tools.dotc.config.Config import java.util.NoSuchElementException diff --git a/src/dotty/tools/dotc/core/TypeComparer.scala b/src/dotty/tools/dotc/core/TypeComparer.scala index 538a74198..991dd2664 100644 --- a/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/src/dotty/tools/dotc/core/TypeComparer.scala @@ -8,7 +8,7 @@ import StdNames.{nme, tpnme} import collection.mutable import util.{Stats, DotClass, SimpleMap} import config.Config -import config.Printers._ +import config.Printers.{typr, constr, subtyping} import TypeErasure.{erasedLub, erasedGlb} import TypeApplications._ import scala.util.control.NonFatal diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala index b69ce2536..5ba9a3351 100644 --- a/src/dotty/tools/dotc/core/TypeOps.scala +++ b/src/dotty/tools/dotc/core/TypeOps.scala @@ -4,7 +4,7 @@ package core import Contexts._, Types._, Symbols._, Names._, Flags._, Scopes._ import SymDenotations._, Denotations.SingleDenotation -import config.Printers._ +import config.Printers.typr import util.Positions._ import NameOps._ import Decorators._ diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala index 87d94dcbe..b45895600 100644 --- a/src/dotty/tools/dotc/core/Types.scala +++ b/src/dotty/tools/dotc/core/Types.scala @@ -28,11 +28,11 @@ import Hashable._ import Uniques._ import collection.{mutable, Seq, breakOut} import config.Config -import config.Printers._ import annotation.tailrec import Flags.FlagSet import language.implicitConversions import scala.util.hashing.{ MurmurHash3 => hashing } +import config.Printers.{core, typr, cyclicErrors} object Types { diff --git a/src/dotty/tools/dotc/reporting/StoreReporter.scala b/src/dotty/tools/dotc/reporting/StoreReporter.scala index 954bff88e..b7b7c1af0 100644 --- a/src/dotty/tools/dotc/reporting/StoreReporter.scala +++ b/src/dotty/tools/dotc/reporting/StoreReporter.scala @@ -5,7 +5,7 @@ package reporting import core.Contexts.Context import collection.mutable import Reporter.{Error, Warning} -import config.Printers._ +import config.Printers.typr /** * This class implements a Reporter that stores all messages diff --git a/src/dotty/tools/dotc/transform/PostTyper.scala b/src/dotty/tools/dotc/transform/PostTyper.scala index fd22a0ad9..8f48836cb 100644 --- a/src/dotty/tools/dotc/transform/PostTyper.scala +++ b/src/dotty/tools/dotc/transform/PostTyper.scala @@ -13,7 +13,7 @@ import Types._, Contexts._, Constants._, Names._, NameOps._, Flags._, DenotTrans import SymDenotations._, Symbols._, StdNames._, Annotations._, Trees._, Scopes._, Denotations._ import util.Positions._ import Decorators._ -import config.Printers._ +import config.Printers.typr import Symbols._, TypeUtils._ /** A macro transform that runs immediately after typer and that performs the following functions: diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala index 1fff14cc6..adc915b03 100644 --- a/src/dotty/tools/dotc/typer/Applications.scala +++ b/src/dotty/tools/dotc/typer/Applications.scala @@ -24,7 +24,7 @@ import ProtoTypes._ import EtaExpansion._ import Inferencing._ import collection.mutable -import config.Printers._ +import config.Printers.{typr, unapp, overload} import TypeApplications._ import language.implicitConversions diff --git a/src/dotty/tools/dotc/typer/Checking.scala b/src/dotty/tools/dotc/typer/Checking.scala index d77520c77..5aa1664c9 100644 --- a/src/dotty/tools/dotc/typer/Checking.scala +++ b/src/dotty/tools/dotc/typer/Checking.scala @@ -26,7 +26,7 @@ import transform.SymUtils._ import Decorators._ import Uniques._ import ErrorReporting.{err, errorType} -import config.Printers._ +import config.Printers.typr import collection.mutable import SymDenotations.NoCompleter diff --git a/src/dotty/tools/dotc/typer/FrontEnd.scala b/src/dotty/tools/dotc/typer/FrontEnd.scala index e193b126a..6ca69ea45 100644 --- a/src/dotty/tools/dotc/typer/FrontEnd.scala +++ b/src/dotty/tools/dotc/typer/FrontEnd.scala @@ -7,7 +7,7 @@ import Contexts._ import Symbols._ import dotty.tools.dotc.parsing.JavaParsers.JavaParser import parsing.Parsers.Parser -import config.Printers._ +import config.Printers.{typr, default} import util.Stats._ import scala.util.control.NonFatal import ast.Trees._ diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/src/dotty/tools/dotc/typer/Implicits.scala index 2a1c18f7d..ef32e0ba6 100644 --- a/src/dotty/tools/dotc/typer/Implicits.scala +++ b/src/dotty/tools/dotc/typer/Implicits.scala @@ -28,7 +28,7 @@ import Inferencing.fullyDefinedType import Trees._ import Hashable._ import config.Config -import config.Printers._ +import config.Printers.{implicits, implicitsDetailed} import collection.mutable /** Implicit resolution */ diff --git a/src/dotty/tools/dotc/typer/Inferencing.scala b/src/dotty/tools/dotc/typer/Inferencing.scala index 719e8d7fc..9a1a42e44 100644 --- a/src/dotty/tools/dotc/typer/Inferencing.scala +++ b/src/dotty/tools/dotc/typer/Inferencing.scala @@ -15,7 +15,7 @@ import util.{Stats, SimpleMap} import util.common._ import Decorators._ import Uniques._ -import config.Printers._ +import config.Printers.{typr, constr} import annotation.tailrec import reporting._ import collection.mutable diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala index d90f37860..7a2348cd3 100644 --- a/src/dotty/tools/dotc/typer/Namer.scala +++ b/src/dotty/tools/dotc/typer/Namer.scala @@ -15,7 +15,7 @@ import annotation.tailrec import ErrorReporting._ import tpd.ListOfTreeDecorator import config.Config -import config.Printers._ +import config.Printers.{typr, completions, noPrinter} import Annotations._ import Inferencing._ import transform.ValueClasses._ diff --git a/src/dotty/tools/dotc/typer/ProtoTypes.scala b/src/dotty/tools/dotc/typer/ProtoTypes.scala index f209c99be..a3e7d127a 100644 --- a/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -15,7 +15,7 @@ import util.common._ import Decorators._ import Uniques._ import ErrorReporting.errorType -import config.Printers._ +import config.Printers.typr import collection.mutable object ProtoTypes { diff --git a/src/dotty/tools/dotc/typer/TypeAssigner.scala b/src/dotty/tools/dotc/typer/TypeAssigner.scala index 36404a68f..9c314b649 100644 --- a/src/dotty/tools/dotc/typer/TypeAssigner.scala +++ b/src/dotty/tools/dotc/typer/TypeAssigner.scala @@ -8,7 +8,7 @@ import Scopes._, Contexts._, Constants._, Types._, Symbols._, Names._, Flags._, import ErrorReporting._, Annotations._, Denotations._, SymDenotations._, StdNames._, TypeErasure._ import TypeApplications.AppliedType import util.Positions._ -import config.Printers._ +import config.Printers.typr import ast.Trees._ import NameOps._ import collection.mutable @@ -81,10 +81,11 @@ trait TypeAssigner { parentType.findMember(decl.name, info.cls.thisType, Private) .suchThat(decl.matches(_)) val inheritedInfo = inherited.info - if (inheritedInfo.exists && decl.info <:< inheritedInfo && !(inheritedInfo <:< decl.info)) - typr.echo( - i"add ref $parent $decl --> ", - RefinedType(parent, decl.name, decl.info)) + if (inheritedInfo.exists && decl.info <:< inheritedInfo && !(inheritedInfo <:< decl.info)) { + val r = RefinedType(parent, decl.name, decl.info) + typr.println(i"add ref $parent $decl --> " + r) + r + } else parent } diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index fdcfe347b..52a9597fe 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -31,7 +31,7 @@ import collection.mutable import annotation.tailrec import Implicits._ import util.Stats.{track, record} -import config.Printers._ +import config.Printers.{typr, gadts} import rewrite.Rewrites.patch import NavigateAST._ import transform.SymUtils._ -- cgit v1.2.3