KE2: extract binary operators #17761
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -256,13 +256,14 @@ private fun KaFunctionSymbol.hasName( | |
| ) | ||
| } | ||
|
|
||
| private fun KaFunctionSymbol?.isNumericWithName(functionName: String): Boolean { | ||
| return this != null && | ||
| (this.hasName("kotlin", "Int", functionName) || | ||
| this.hasName("kotlin", "Byte", functionName) || | ||
| this.hasName("kotlin", "Short", functionName) || | ||
| this.hasName("kotlin", "Long", functionName) || | ||
| this.hasName("kotlin", "Float", functionName) || | ||
| this.hasName("kotlin", "Double", functionName)) | ||
| } | ||
|
|
||
| context(KaSession) | ||
|
|
@@ -297,37 +298,84 @@ private fun KotlinFileExtractor.extractBinaryExpression( | |
| val op = expression.operationToken | ||
| val target = expression.resolveCallTarget()?.symbol | ||
|
|
||
| if (op == KtTokens.PLUS && target.isBinaryPlus()) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_addexpr) | ||
| } else if (op == KtTokens.MINUS && target.isNumericWithName("minus")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_subexpr) | ||
|
There was a problem hiding this comment. So far at least this is very regular; I wonder if it would be worth writing as ? And either way, something like might be nicer than a big if/elseif There was a problem hiding this comment. Here's the followup refactoring PR: #17974 |
||
| } else if (op == KtTokens.MUL && target.isNumericWithName("times")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_mulexpr) | ||
| } else if (op == KtTokens.DIV && target.isNumericWithName("div")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_divexpr) | ||
| } else if (op == KtTokens.PERC && target.isNumericWithName("rem")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_remexpr) | ||
| } else if (op == KtTokens.IDENTIFIER && target.isNumericWithName("and")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_andbitexpr) | ||
| } else if (op == KtTokens.IDENTIFIER && target.isNumericWithName("or")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_orbitexpr) | ||
| } else if (op == KtTokens.IDENTIFIER && target.isNumericWithName("xor")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_xorbitexpr) | ||
| } else if (op == KtTokens.IDENTIFIER && target.isNumericWithName("shl")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_lshiftexpr) | ||
| } else if (op == KtTokens.IDENTIFIER && target.isNumericWithName("shr")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_rshiftexpr) | ||
| } else if (op == KtTokens.IDENTIFIER && target.isNumericWithName("ushr")) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_urshiftexpr) | ||
| } else if (op == KtTokens.EQEQEQ && target == null) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_eqexpr) | ||
| } else if (op == KtTokens.EXCLEQEQEQ && target == null) { | ||
| extractBinaryExpression(expression, callable, parent, tw::writeExprs_neexpr) | ||
| } else if (op in listOf(KtTokens.LT, KtTokens.GT, KtTokens.LTEQ, KtTokens.GTEQ)) { | ||
| if (target.isNumericWithName("compareTo")) { | ||
| when (op) { | ||
| KtTokens.LT -> extractBinaryExpression(expression, callable, parent, tw::writeExprs_ltexpr) | ||
| KtTokens.GT -> extractBinaryExpression(expression, callable, parent, tw::writeExprs_gtexpr) | ||
| KtTokens.LTEQ -> extractBinaryExpression(expression, callable, parent, tw::writeExprs_leexpr) | ||
| KtTokens.GTEQ -> extractBinaryExpression(expression, callable, parent, tw::writeExprs_geexpr) | ||
| else -> TODO("error") | ||
|
There was a problem hiding this comment. If we're changing this to just return |
||
| } | ||
| } else { | ||
| TODO("Extract lowered equivalent call, such as `a.compareTo(b) < 0`") | ||
|
There was a problem hiding this comment. Ah, but my previous suggestion won't work if we need to do something special in this case. There was a problem hiding this comment. I don't think we need the comment. Instead we should merge this too: #17939 |
||
| } | ||
|
|
||
| } else { | ||
| // todo: other operators, such as .., ..<, in, !in, =, +=, -=, *=, /=, %=, ==, !=, | ||
| TODO("Extract as method call") | ||
| } | ||
| } | ||
|
|
||
| private fun KaFunctionSymbol?.isBinaryPlus(): Boolean { | ||
| return this != null && ( | ||
| this.isNumericWithName("plus") || | ||
| this.hasName("kotlin", "String", "plus") || | ||
| /* The target for `(null as String?) + null` is `public operator fun String?.plus(other: Any?): String` */ | ||
| this.hasMatchingNames( | ||
| CallableId(FqName("kotlin"), null, Name.identifier("plus")), | ||
| ClassId(FqName("kotlin"), Name.identifier("String")), | ||
| nullability = KaTypeNullability.NULLABLE, | ||
|
There was a problem hiding this comment. I think it would be worth adding a comment saying what this last case corresponds to There was a problem hiding this comment. I can dig that up, but this bit was just refactored. It was originally introduced in #17752 There was a problem hiding this comment. Comment added in 53460d7. |
||
| )) | ||
| } | ||
|
|
||
| context(KaSession) | ||
| private fun <T : DbBinaryexpr> KotlinFileExtractor.extractBinaryExpression( | ||
| expression: KtBinaryExpression, | ||
| callable: Label<out DbCallable>, | ||
| parent: StmtExprParent, | ||
| extractExpression: ( | ||
| id: Label<out T>, | ||
| typeid: Label<out DbType>, | ||
| parent: Label<out DbExprparent>, | ||
| idx: Int | ||
| ) -> Unit | ||
| ) { | ||
| val id = tw.getFreshIdLabel<T>() | ||
| val type = useType(expression.expressionType) | ||
| val exprParent = parent.expr(expression, callable) | ||
| extractExpression(id, type.javaResult.id, exprParent.parent, exprParent.idx) | ||
| tw.writeExprsKotlinType(id, type.kotlinResult.id) | ||
|
|
||
| extractExprContext(id, tw.getLocation(expression), callable, exprParent.enclosingStmt) | ||
| extractExpressionExpr(expression.left!!, callable, id, 0, exprParent.enclosingStmt) | ||
| extractExpressionExpr(expression.right!!, callable, id, 1, exprParent.enclosingStmt) | ||
| } | ||
|
|
||
| context(KaSession) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the plan for
target == null?If we're just going to emit an
errorExpr, and perhaps add some more info in a supplementary table, then can we handle that case first, and makeisNumericWithNameandisBinaryPlustake a non-null KaFunctionSymbol and not have to handle thenullcase?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are cases below where target is null, for example in case of
===.