hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-25 00:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18075 from igfoo/igfoo/comp

Browse Source 
KE2: Small refactoring
This commit is contained in:
Ian Lynagh
2024-11-22 15:34:28 +00:00
committed by GitHub
parent 37e950dcbf d280a41062
commit bb50bc0d85
1 changed files with 57 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
java/kotlin-extractor2/src/main/kotlin/entities/Expression.kt
View File

@@ -385,69 +385,64 @@ private fun KotlinFileExtractor.extractBinaryExpression(
return extractBinaryExpression(expression, callable, parent, trapWriterWriteExpr)
}
when {
op in listOf(KtTokens.LT, KtTokens.GT, KtTokens.LTEQ, KtTokens.GTEQ) -> {
// Extract lowered equivalent call, such as `a.compareTo(b) < 0` instead of `a < b` in the below:
// ```
// fun test(a: Data, b: Data) {
// a < b
// }
//
// class Data(val v: Int) : Comparable<Data> {
// override fun compareTo(other: Data) = v.compareTo(other.v)
// }
// ```
val exprParent = parent.expr(expression, callable)
val trapWriterWriteExpr = when (op) {
KtTokens.LT -> tw::writeExprs_ltexpr
KtTokens.GT -> tw::writeExprs_gtexpr
KtTokens.LTEQ -> tw::writeExprs_leexpr
KtTokens.GTEQ -> tw::writeExprs_geexpr
else -> TODO("error")
}
val id = extractRawBinaryExpression(builtinTypes.boolean, exprParent, trapWriterWriteExpr)
extractExprContext(id, tw.getLocation(expression), callable, exprParent.enclosingStmt)
extractRawMethodAccess(
target,
tw.getLocation(expression),
target.returnType,
callable,
id,
0,
exprParent.enclosingStmt,
if (target.isExtension) null else expression.left!!,
if (target.isExtension) expression.left!! else null,
listOf(expression.right!!)
)
extractConstantInteger(
"0",
builtinTypes.int,
0,
tw.getLocation(expression),
id,
1,
callable,
exprParent.enclosingStmt,
/*
OLD: KE1
overrideId = overrideId
*/
)
return id
}
else -> {
// todo: other operators, such as .., ..<, in, !in, =, +=, -=, *=, /=, %=, ==, !=,
TODO("Extract as method call")
}
val trapWriterWriteExprComparison = when (op) {
KtTokens.LT -> tw::writeExprs_ltexpr
KtTokens.GT -> tw::writeExprs_gtexpr
KtTokens.LTEQ -> tw::writeExprs_leexpr
KtTokens.GTEQ -> tw::writeExprs_geexpr
else -> null
}
if (trapWriterWriteExprComparison != null) {
// Extract lowered equivalent call, such as `a.compareTo(b) < 0` instead of `a < b` in the below:
// ```
// fun test(a: Data, b: Data) {
// a < b
// }
//
// class Data(val v: Int) : Comparable<Data> {
// override fun compareTo(other: Data) = v.compareTo(other.v)
// }
// ```
val exprParent = parent.expr(expression, callable)
val id = extractRawBinaryExpression(builtinTypes.boolean, exprParent, trapWriterWriteExprComparison)
extractExprContext(id, tw.getLocation(expression), callable, exprParent.enclosingStmt)
extractRawMethodAccess(
target,
tw.getLocation(expression),
target.returnType,
callable,
id,
0,
exprParent.enclosingStmt,
if (target.isExtension) null else expression.left!!,
if (target.isExtension) expression.left!! else null,
listOf(expression.right!!)
)
extractConstantInteger(
"0",
builtinTypes.int,
0,
tw.getLocation(expression),
id,
1,
callable,
exprParent.enclosingStmt,
/*
OLD: KE1
overrideId = overrideId
*/
)
return id
}
// todo: other operators, such as .., ..<, in, !in, =, +=, -=, *=, /=, %=, ==, !=,
TODO("Extract as method call")
}