Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/dotty/tools/dotc/ast/Desugar.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Decorators._
import language.higherKinds
import collection.mutable.ListBuffer
import util.Attachment
import config.Printers._

object desugar {

Expand Down
1 change: 0 additions & 1 deletion src/dotty/tools/dotc/ast/tpd.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down
2 changes: 0 additions & 2 deletions src/dotty/tools/dotc/config/Printers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/dotty/tools/dotc/core/CheckRealizable.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/Constraint.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/ConstraintHandling.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion src/dotty/tools/dotc/core/ConstraintRunInfo.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion src/dotty/tools/dotc/core/OrderingConstraint.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/Phases.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/SymDenotations.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/TypeApplications.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/TypeComparer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/TypeOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/Types.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/reporting/StoreReporter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/transform/PostTyper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/Applications.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/Checking.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/FrontEnd.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/Implicits.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/Inferencing.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/Namer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/ProtoTypes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 6 additions & 5 deletions src/dotty/tools/dotc/typer/TypeAssigner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/typer/Typer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down