Skip to content

Remove PreName add (almost) all other implicit conversions #4077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

Remove PreName add (almost) all other implicit conversions #4077

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1e471b7
Add bench/compile.txt to gitignore
OlivierBlanvillain Feb 13, 2018
2aa965c
Remove PreName
OlivierBlanvillain Feb 13, 2018
57df5b5
Devirtualize Denotation.info
OlivierBlanvillain Feb 14, 2018
163509d
Devirtualize Type.exists
OlivierBlanvillain Feb 14, 2018
f4e9ccd
Devirtualize Tree.tpe
OlivierBlanvillain Feb 14, 2018
a50b2d4
Remove a few implicit conversions
OlivierBlanvillain Mar 7, 2018
b18fba5
Remove modsDeco
OlivierBlanvillain Mar 7, 2018
e07a68d
Explicit Context to Printer conversion
OlivierBlanvillain Feb 27, 2018
ebe084f
Explicit SourcePosition to Position conversions
OlivierBlanvillain Feb 27, 2018
d870b36
Remove FlagConjunction
OlivierBlanvillain Feb 28, 2018
c064915
Explicit ModifiersParsingTest.parse
OlivierBlanvillain Mar 7, 2018
9866c74
Explicit Str.parse
OlivierBlanvillain Feb 28, 2018
27ee9a4
Explicit Position to Coord conversion
OlivierBlanvillain Feb 28, 2018
4f119bc
Explicit Text to String conversion
OlivierBlanvillain Mar 1, 2018
f2fba0b
Remove implicit conversion in repl tests
OlivierBlanvillain Mar 1, 2018
c01612a
Refactor SymUtils.decorate* as an implicit class
OlivierBlanvillain Mar 1, 2018
0bed6fd
Refactor decorateTypeApplication as implicit class
OlivierBlanvillain Mar 1, 2018
01cc814
Explicit String to Name conversion in StdNames
OlivierBlanvillain Mar 9, 2018
c49d246
Remove Context to ContextBase implicit conversion
OlivierBlanvillain Mar 9, 2018
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
8 changes: 5 additions & 3 deletions compiler/src/dotty/tools/dotc/ast/Trees.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ object Trees {
/** The type constructor at the root of the tree */
type ThisTree[T >: Untyped] <: Tree[T]

private[this] var myTpe: T = _
protected var myTpe: T @uncheckedVariance = _

/** Destructively set the type of the tree. This should be called only when it is known that
* it is safe under sharing to do so. One use-case is in the withType method below
Expand All @@ -91,7 +91,7 @@ object Trees {
/** The type of the tree. In case of an untyped tree,
* an UnAssignedTypeException is thrown. (Overridden by empty trees)
*/
def tpe: T @uncheckedVariance = {
final def tpe: T @uncheckedVariance = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit LGTM

if (myTpe == null)
throw new UnAssignedTypeException(this)
myTpe
Expand Down Expand Up @@ -727,7 +727,6 @@ object Trees {
}

trait WithoutTypeOrPos[-T >: Untyped] extends Tree[T] {
override def tpe: T @uncheckedVariance = NoType.asInstanceOf[T]
override def withTypeUnchecked(tpe: Type) = this.asInstanceOf[ThisTree[Type]]
override def pos = NoPosition
override def setPos(pos: Position) = {}
Expand All @@ -740,6 +739,8 @@ object Trees {
*/
case class Thicket[-T >: Untyped](trees: List[Tree[T]])
extends Tree[T] with WithoutTypeOrPos[T] {
myTpe = NoType.asInstanceOf[T]

type ThisTree[-T >: Untyped] = Thicket[T]
override def isEmpty: Boolean = trees.isEmpty
override def toList: List[Tree[T]] = flatten(trees)
Expand All @@ -758,6 +759,7 @@ object Trees {

class EmptyValDef[T >: Untyped] extends ValDef[T](
nme.WILDCARD, genericEmptyTree[T], genericEmptyTree[T]) with WithoutTypeOrPos[T] {
myTpe = NoType.asInstanceOf[T]
override def isEmpty: Boolean = true
setMods(untpd.Modifiers(PrivateLocal))
}
Expand Down