8000 WIP mapOver/traverse/transform: refactor pattern match into virtual call [ci: last-only] by retronym · Pull Request #5906 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

WIP mapOver/traverse/transform: refactor pattern match into virtual call [ci: last-only] #5906

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 5 commits into from
Closed

WIP mapOver/traverse/transform: refactor pattern match into virtual call [ci: last-only] #5906

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2518bc6
Spread Tree transform/traverse into virtual methods of Tree
retronym May 9, 2017
c26c401
Spread mapOver into invokevirtual of Type.mapOver
retronym May 9, 2017
4755750
Favour direct use of Type.mapOver
retronym May 14, 2017
372d152
Revert "SI-3832 Extract tracking of under-construction classes to a m…
retronym May 14, 2017
14fe4f1
Avoid indirection through bridges
retronym May 15, 2017
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
Prev Previous commit
Next Next commit
Revert "SI-3832 Extract tracking of under-construction classes to a m… 
…ixin"

This reverts commit c2dc346.
  • Loading branch information
@retronym
retronym committed May 15, 2017
commit 372d1526f3d4c239f5b1573f9647dbc38ccd0981
17 changes: 15 additions & 2 deletions src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ abstract class ExplicitOuter extends InfoTransform
* values for outer parameters of constructors.
* The class provides methods for referencing via outer.
*/
abstract class OuterPathTransformer(unit: CompilationUnit) extends TypingTransformer(unit) with UnderConstructionTransformer {
abstract class OuterPathTransformer(unit: CompilationUnit) extends TypingTransformer(unit) {
/** The directly enclosing outer parameter, if we are in a constructor */
protected var outerParam: Symbol = NoSymbol

Expand Down Expand Up @@ -267,6 +267,13 @@ abstract class ExplicitOuter extends InfoTransform
else outerPath(outerSelect(base), from.outerClass, to)
}


/** The stack of class symbols in which a call to this() or to the super
* constructor, or early definition is active
*/
protected def isUnderConstruction(clazz: Symbol) = selfOrSuperCalls contains clazz
protected val selfOrSuperCalls = collection.mutable.Stack[Symbol]()

override def transform(tree: Tree): Tree = {
def sym = tree.symbol
val savedOuterParam = outerParam
Expand All @@ -279,7 +286,13 @@ abstract class ExplicitOuter extends InfoTransform
assert(outerParam.name startsWith nme.OUTER, outerParam.name)
case _ =>
}
super.transform(tree)
if ((treeInfo isSelfOrSuperConstrCall tree) || (treeInfo isEarlyDef tree)) {
selfOrSuperCalls push currentOwner.owner
val transformed = super.transform(tree)
selfOrSuperCalls.pop()
transformed
} else
super.transform(tree)
}
finally outerParam = savedOuterParam
}
Expand Down
19 changes: 0 additions & 19 deletions src/reflect/scala/reflect/internal/Trees.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,25 +1762,6 @@ trait Trees extends api.Trees {
}
}

/** Tracks the classes currently under construction during a transform */
trait UnderConstructionTransformer extends Transformer {
import collection.mutable

protected def isUnderConstruction(clazz: Symbol) = selfOrSuperCalls contains clazz

/** The stack of class symbols in which a call to this() or to the super
* constructor, or early definition is active */
private val selfOrSuperCalls = mutable.Stack[Symbol]()

abstract override def transform(tree: Tree) = {
if ((treeInfo isSelfOrSuperConstrCall tree) || (treeInfo isEarlyDef tree)) {
selfOrSuperCalls push currentOwner.owner
try super.transform(tree)
finally selfOrSuperCalls.pop()
} else super.transform(tree)
}
}

def duplicateAndKeepPositions(tree: Tree) = new Duplicator(focusPositions = false) transform tree

// this is necessary to avoid crashes like https://github.com/scalamacros/paradise/issues/1
Expand Down
0