azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace type entries of JsContext<*> with JsContext<JsNode>

Browse Source 
It's needed to make method calls (e.g. replaceMe) on it typesafe,
otherwise it's value parameter type is subtype of captured
This commit is contained in:
Denis Zharkov
2015-12-22 08:03:37 +03:00
parent 9773e98d8a
commit ec0ec55ab5
6 changed files with 70 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
+56 -56
View File
@@ -72,7 +72,7 @@ internal class ExpressionDecomposer private constructor(
} }
// TODO: add test case (after KT-7371 fix): var a = foo(), b = foo() + inlineBar() // TODO: add test case (after KT-7371 fix): var a = foo(), b = foo() + inlineBar()
override fun visit(x: JsVars, ctx: JsContext<*>): Boolean { override fun visit(x: JsVars, ctx: JsContext<JsNode>): Boolean {
val vars = x.getVars() val vars = x.getVars()
var prevVars = SmartList<JsVars.JsVar>() var prevVars = SmartList<JsVars.JsVar>()
@@ -91,12 +91,12 @@ internal class ExpressionDecomposer private constructor(
return false return false
} }
override fun visit(x: JsWhile, ctx: JsContext<*>): Boolean { override fun visit(x: JsWhile, ctx: JsContext<JsNode>): Boolean {
x.process(true) x.process(true)
return false return false
} }
override fun visit(x: JsDoWhile, ctx: JsContext<*>): Boolean { override fun visit(x: JsDoWhile, ctx: JsContext<JsNode>): Boolean {
x.process(false) x.process(false)
return false return false
} }
@@ -126,7 +126,7 @@ internal class ExpressionDecomposer private constructor(
} }
// TODO: comma operator? // TODO: comma operator?
override fun visit(x: JsBinaryOperation, ctx: JsContext<*>): Boolean { override fun visit(x: JsBinaryOperation, ctx: JsContext<JsNode>): Boolean {
x.arg1 = accept(x.arg1) x.arg1 = accept(x.arg1)
when (x.operator) { when (x.operator) {
@@ -138,7 +138,7 @@ internal class ExpressionDecomposer private constructor(
return false return false
} }
private fun JsBinaryOperation.processOrAnd(ctx: JsContext<*>) { private fun JsBinaryOperation.processOrAnd(ctx: JsContext<JsNode>) {
if (arg2 !in containsExtractable) return if (arg2 !in containsExtractable) return
val tmp = Temporary(arg1) val tmp = Temporary(arg1)
@@ -176,13 +176,13 @@ internal class ExpressionDecomposer private constructor(
arg2 = accept(arg2) arg2 = accept(arg2)
} }
override fun visit(x: JsArrayLiteral, ctx: JsContext<*>): Boolean { override fun visit(x: JsArrayLiteral, ctx: JsContext<JsNode>): Boolean {
val elements = x.getExpressions() val elements = x.getExpressions()
processByIndices(elements, elements.indicesOfExtractable) processByIndices(elements, elements.indicesOfExtractable)
return false return false
} }
override fun visit(x: JsArrayAccess, ctx: JsContext<*>): Boolean { override fun visit(x: JsArrayAccess, ctx: JsContext<JsNode>): Boolean {
x.process() x.process()
return false return false
} }
@@ -197,12 +197,12 @@ internal class ExpressionDecomposer private constructor(
index = accept(index) index = accept(index)
} }
override fun visit(x: JsConditional, ctx: JsContext<*>): Boolean { override fun visit(x: JsConditional, ctx: JsContext<JsNode>): Boolean {
x.process(ctx) x.process(ctx)
return false return false
} }
private fun JsConditional.process(ctx: JsContext<*>) { private fun JsConditional.process(ctx: JsContext<JsNode>) {
test = accept(test) test = accept(test)
if (then !in containsExtractable && otherwise !in containsExtractable) return if (then !in containsExtractable && otherwise !in containsExtractable) return
@@ -226,12 +226,12 @@ internal class ExpressionDecomposer private constructor(
ctx.replaceMe(tmp.nameRef) ctx.replaceMe(tmp.nameRef)
} }
override fun visit(x: JsInvocation, ctx: JsContext<*>): Boolean { override fun visit(x: JsInvocation, ctx: JsContext<JsNode>): Boolean {
CallableInvocationAdapter(x).process() CallableInvocationAdapter(x).process()
return false return false
} }
override fun visit(x: JsNew, ctx: JsContext<*>): Boolean { override fun visit(x: JsNew, ctx: JsContext<JsNode>): Boolean {
CallableNewAdapter(x).process() CallableNewAdapter(x).process()
return false return false
} }
@@ -339,69 +339,69 @@ internal class ExpressionDecomposer private constructor(
*/ */
internal open class JsExpressionVisitor() : JsVisitorWithContextImpl() { internal open class JsExpressionVisitor() : JsVisitorWithContextImpl() {
override fun visit(x: JsBlock, ctx: JsContext<*>): Boolean = false override fun visit(x: JsBlock, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsTry, ctx: JsContext<*>): Boolean = false override fun visit(x: JsTry, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsDebugger, ctx: JsContext<*>): Boolean = false override fun visit(x: JsDebugger, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsLabel, ctx: JsContext<*>): Boolean = false override fun visit(x: JsLabel, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsFunction, ctx: JsContext<*>): Boolean = false override fun visit(x: JsFunction, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsObjectLiteral, ctx: JsContext<*>): Boolean = false override fun visit(x: JsObjectLiteral, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsPropertyInitializer, ctx: JsContext<*>): Boolean = false override fun visit(x: JsPropertyInitializer, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsProgramFragment, ctx: JsContext<*>): Boolean = false override fun visit(x: JsProgramFragment, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsProgram, ctx: JsContext<*>): Boolean = false override fun visit(x: JsProgram, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsParameter, ctx: JsContext<*>): Boolean = false override fun visit(x: JsParameter, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsCatch, ctx: JsContext<*>): Boolean = false override fun visit(x: JsCatch, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsBreak, ctx: JsContext<*>): Boolean = false override fun visit(x: JsBreak, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsContinue, ctx: JsContext<*>): Boolean = false override fun visit(x: JsContinue, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsCase, ctx: JsContext<*>): Boolean = false override fun visit(x: JsCase, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsDefault, ctx: JsContext<*>): Boolean = false override fun visit(x: JsDefault, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsEmpty, ctx: JsContext<*>): Boolean = false override fun visit(x: JsEmpty, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsLiteral.JsBooleanLiteral, ctx: JsContext<*>): Boolean = false override fun visit(x: JsLiteral.JsBooleanLiteral, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsLiteral.JsThisRef, ctx: JsContext<*>): Boolean = false override fun visit(x: JsLiteral.JsThisRef, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsNullLiteral, ctx: JsContext<*>): Boolean = false override fun visit(x: JsNullLiteral, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsNumberLiteral, ctx: JsContext<*>): Boolean = false override fun visit(x: JsNumberLiteral, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsRegExp, ctx: JsContext<*>): Boolean = false override fun visit(x: JsRegExp, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsStringLiteral, ctx: JsContext<*>): Boolean = false override fun visit(x: JsStringLiteral, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsName, ctx: JsContext<*>): Boolean = false override fun visit(x: JsName, ctx: JsContext<JsNode>): Boolean = false
// TODO: support these // TODO: support these
// Not generated by compiler now, (can be generated in future or used in js() block) // Not generated by compiler now, (can be generated in future or used in js() block)
override fun visit(x: JsForIn, ctx: JsContext<*>): Boolean = false override fun visit(x: JsForIn, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsSwitch, ctx: JsContext<*>): Boolean = false override fun visit(x: JsSwitch, ctx: JsContext<JsNode>): Boolean = false
// Compiler generates restricted version of for, // Compiler generates restricted version of for,
// where init and test do not contain inline calls. // where init and test do not contain inline calls.
override fun visit(x: JsFor, ctx: JsContext<*>): Boolean = false override fun visit(x: JsFor, ctx: JsContext<JsNode>): Boolean = false
override fun visit(x: JsIf, ctx: JsContext<*>): Boolean { override fun visit(x: JsIf, ctx: JsContext<JsNode>): Boolean {
val test = x.getIfExpression() val test = x.getIfExpression()
x.setIfExpression(accept(test)) x.setIfExpression(accept(test))
return false return false
} }
override fun visit(x: JsWhile, ctx: JsContext<*>): Boolean { override fun visit(x: JsWhile, ctx: JsContext<JsNode>): Boolean {
x.test = accept(x.test) x.test = accept(x.test)
return false return false
} }
override fun visit(x: JsDoWhile, ctx: JsContext<*>): Boolean { override fun visit(x: JsDoWhile, ctx: JsContext<JsNode>): Boolean {
x.test = accept(x.test) x.test = accept(x.test)
return false return false
} }
override fun visit(x: JsArrayAccess, ctx: JsContext<*>): Boolean = true override fun visit(x: JsArrayAccess, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsArrayLiteral, ctx: JsContext<*>): Boolean = true override fun visit(x: JsArrayLiteral, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsBinaryOperation, ctx: JsContext<*>): Boolean = true override fun visit(x: JsBinaryOperation, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsConditional, ctx: JsContext<*>): Boolean = true override fun visit(x: JsConditional, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsInvocation, ctx: JsContext<*>): Boolean = true override fun visit(x: JsInvocation, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsNameRef, ctx: JsContext<*>): Boolean = true override fun visit(x: JsNameRef, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsNew, ctx: JsContext<*>): Boolean = true override fun visit(x: JsNew, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsVars.JsVar, ctx: JsContext<*>): Boolean = true override fun visit(x: JsVars.JsVar, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsPostfixOperation, ctx: JsContext<*>): Boolean = true override fun visit(x: JsPostfixOperation, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsPrefixOperation, ctx: JsContext<*>): Boolean = true override fun visit(x: JsPrefixOperation, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsExpressionStatement, ctx: JsContext<*>): Boolean = true override fun visit(x: JsExpressionStatement, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsReturn, ctx: JsContext<*>): Boolean = true override fun visit(x: JsReturn, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsThrow, ctx: JsContext<*>): Boolean = true override fun visit(x: JsThrow, ctx: JsContext<JsNode>): Boolean = true
override fun visit(x: JsVars, ctx: JsContext<*>): Boolean = true override fun visit(x: JsVars, ctx: JsContext<JsNode>): Boolean = true
} }
/** /**
@@ -411,7 +411,7 @@ private fun JsNode.match(predicate: (JsNode) -> Boolean): Set<JsNode> {
val visitor = object : JsExpressionVisitor() { val visitor = object : JsExpressionVisitor() {
val matched = IdentitySet<JsNode>() val matched = IdentitySet<JsNode>()
override fun <R : JsNode> doTraverse(node: R, ctx: JsContext<*>?) { override fun <R : JsNode> doTraverse(node: R, ctx: JsContext<JsNode>?) {
super.doTraverse(node, ctx) super.doTraverse(node, ctx)
if (node !in matched && predicate(node)) { if (node !in matched && predicate(node)) {
@@ -432,7 +432,7 @@ private fun JsNode.withParentsOfNodes(nodes: Set<JsNode>): Set<JsNode> {
private val stack = SmartList<JsNode>() private val stack = SmartList<JsNode>()
val matched = IdentitySet<JsNode>() val matched = IdentitySet<JsNode>()
override fun <R : JsNode> doTraverse(node: R, ctx: JsContext<*>?) { override fun <R : JsNode> doTraverse(node: R, ctx: JsContext<JsNode>?) {
stack.add(node) stack.add(node)
super.doTraverse(node, ctx) super.doTraverse(node, ctx)
js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt
+1 -1
View File
@@ -179,7 +179,7 @@ private fun replaceExternalNames(function: JsFunction, externalReplacements: Map
if (replacements.isEmpty()) return if (replacements.isEmpty()) return
val visitor = object: JsVisitorWithContextImpl() { val visitor = object: JsVisitorWithContextImpl() {
override fun endVisit(x: JsNameRef, ctx: JsContext<*>) { override fun endVisit(x: JsNameRef, ctx: JsContext<JsNode>) {
if (x.getQualifier() != null) return if (x.getQualifier() != null) return
replacements[x.getIdent()]?.let { replacements[x.getIdent()]?.let {
js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/NameReplacingVisitor.kt
+4 -11
View File
@@ -16,25 +16,18 @@
package org.jetbrains.kotlin.js.inline.util.rewriters package org.jetbrains.kotlin.js.inline.util.rewriters
import com.google.dart.compiler.backend.js.ast.JsVisitorWithContextImpl import com.google.dart.compiler.backend.js.ast.*
import com.google.dart.compiler.backend.js.ast.JsName
import com.google.dart.compiler.backend.js.ast.JsExpression
import com.google.dart.compiler.backend.js.ast.JsNameRef
import com.google.dart.compiler.backend.js.ast.JsContext
import com.google.dart.compiler.backend.js.ast.JsVars
import com.google.dart.compiler.backend.js.ast.HasName
import com.google.dart.compiler.backend.js.ast.JsLabel
class NameReplacingVisitor(private val replaceMap: Map<JsName, JsExpression>) : JsVisitorWithContextImpl() { class NameReplacingVisitor(private val replaceMap: Map<JsName, JsExpression>) : JsVisitorWithContextImpl() {
override fun endVisit(x: JsNameRef, ctx: JsContext<*>) { override fun endVisit(x: JsNameRef, ctx: JsContext<JsNode>) {
val replacement = replaceMap[x.getName()] val replacement = replaceMap[x.getName()]
if (replacement == null) return if (replacement == null) return
ctx.replaceMe(replacement) ctx.replaceMe(replacement)
} }
override fun endVisit(x: JsVars.JsVar, ctx: JsContext<*>) { override fun endVisit(x: JsVars.JsVar, ctx: JsContext<JsNode>) {
val replacement = replaceMap[x.getName()] val replacement = replaceMap[x.getName()]
if (replacement is HasName) { if (replacement is HasName) {
val replacementVar = JsVars.JsVar(replacement.getName(), x.getInitExpression()) val replacementVar = JsVars.JsVar(replacement.getName(), x.getInitExpression())
@@ -42,7 +35,7 @@ class NameReplacingVisitor(private val replaceMap: Map<JsName, JsExpression>) :
} }
} }
override fun endVisit(x: JsLabel, ctx: JsContext<*>) { override fun endVisit(x: JsLabel, ctx: JsContext<JsNode>) {
val replacement = replaceMap[x.getName()] val replacement = replaceMap[x.getName()]
if (replacement is HasName) { if (replacement is HasName) {
val replacementLabel = JsLabel(replacement.getName(), x.getStatement()) val replacementLabel = JsLabel(replacement.getName(), x.getStatement())
js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ReturnReplacingVisitor.kt
+4 -12
View File
@@ -16,15 +16,7 @@
package org.jetbrains.kotlin.js.inline.util.rewriters package org.jetbrains.kotlin.js.inline.util.rewriters
import com.google.dart.compiler.backend.js.ast.JsBreak import com.google.dart.compiler.backend.js.ast.*
import com.google.dart.compiler.backend.js.ast.JsContext
import com.google.dart.compiler.backend.js.ast.JsExpression
import com.google.dart.compiler.backend.js.ast.JsExpressionStatement
import com.google.dart.compiler.backend.js.ast.JsFunction
import com.google.dart.compiler.backend.js.ast.JsNameRef
import com.google.dart.compiler.backend.js.ast.JsObjectLiteral
import com.google.dart.compiler.backend.js.ast.JsReturn
import com.google.dart.compiler.backend.js.ast.JsVisitorWithContextImpl
import org.jetbrains.kotlin.js.inline.util.canHaveSideEffect import org.jetbrains.kotlin.js.inline.util.canHaveSideEffect
import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
@@ -33,14 +25,14 @@ public class ReturnReplacingVisitor(private val resultRef: JsNameRef?, private v
/** /**
* Prevents replacing returns in object literal * Prevents replacing returns in object literal
*/ */
override fun visit(x: JsObjectLiteral, ctx: JsContext<*>): Boolean = false override fun visit(x: JsObjectLiteral, ctx: JsContext<JsNode>): Boolean = false
/** /**
* Prevents replacing returns in inner function * Prevents replacing returns in inner function
*/ */
override fun visit(x: JsFunction, ctx: JsContext<*>): Boolean = false override fun visit(x: JsFunction, ctx: JsContext<JsNode>): Boolean = false
override fun endVisit(x: JsReturn, ctx: JsContext<*>) { override fun endVisit(x: JsReturn, ctx: JsContext<JsNode>) {
ctx.removeMe() ctx.removeMe()
val returnReplacement = getReturnReplacement(x.getExpression()) val returnReplacement = getReturnReplacement(x.getExpression())
js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ThisReplacingVisitor.kt
+4 -9
View File
@@ -16,19 +16,14 @@
package org.jetbrains.kotlin.js.inline.util.rewriters package org.jetbrains.kotlin.js.inline.util.rewriters
import com.google.dart.compiler.backend.js.ast.JsContext import com.google.dart.compiler.backend.js.ast.*
import com.google.dart.compiler.backend.js.ast.JsExpression
import com.google.dart.compiler.backend.js.ast.JsFunction
import com.google.dart.compiler.backend.js.ast.JsLiteral
import com.google.dart.compiler.backend.js.ast.JsObjectLiteral
import com.google.dart.compiler.backend.js.ast.JsVisitorWithContextImpl
class ThisReplacingVisitor(private val thisReplacement: JsExpression) : JsVisitorWithContextImpl() { class ThisReplacingVisitor(private val thisReplacement: JsExpression) : JsVisitorWithContextImpl() {
override fun endVisit(x: JsLiteral.JsThisRef, ctx: JsContext<*>) { override fun endVisit(x: JsLiteral.JsThisRef, ctx: JsContext<JsNode>) {
ctx.replaceMe(thisReplacement) ctx.replaceMe(thisReplacement)
} }
override fun visit(x: JsFunction, ctx: JsContext<*>) = false override fun visit(x: JsFunction, ctx: JsContext<JsNode>) = false
override fun visit(x: JsObjectLiteral, ctx: JsContext<*>) = false override fun visit(x: JsObjectLiteral, ctx: JsContext<JsNode>) = false
} }
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*
public fun expandIsCalls(node: JsNode, context: TranslationContext) { public fun expandIsCalls(node: JsNode, context: TranslationContext) {
val visitor = object : JsVisitorWithContextImpl() { val visitor = object : JsVisitorWithContextImpl() {
override fun visit(x: JsInvocation, ctx: JsContext<*>): Boolean { override fun visit(x: JsInvocation, ctx: JsContext<JsNode>): Boolean {
val callee = x.getQualifier() as? JsInvocation val callee = x.getQualifier() as? JsInvocation
val instance = x.getArguments().firstOrNull() val instance = x.getArguments().firstOrNull()
val type = callee?.getArguments()?.firstOrNull() val type = callee?.getArguments()?.firstOrNull()