Kotlin: Add while statements

igfoo · igfoo · commit b25ea03211df · 2022-05-10T18:45:52.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin.*
 import org.jetbrains.kotlin.ir.expressions.IrWhen
 import org.jetbrains.kotlin.ir.expressions.IrElseBranch
+import org.jetbrains.kotlin.ir.expressions.IrWhileLoop
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 
@@ -288,6 +289,16 @@ class KotlinFileExtractor(val tw: TrapWriter) {
                 tw.writeStmts_returnstmt(id, parent, idx, callable)
                 tw.writeHasLocation(id, locId)
                 extractExpression(s.value, id, 0)
+            } is IrWhileLoop -> {
+                val id = tw.getFreshIdLabel<DbWhilestmt>()
+                val locId = tw.getLocation(s.startOffset, s.endOffset)
+                tw.writeStmts_whilestmt(id, parent, idx, callable)
+                tw.writeHasLocation(id, locId)
+                extractExpression(s.condition, id, 0)
+                val body = s.body
+                if(body != null) {
+                    extractExpression(body, id, 1) // TODO: The QLLs think this is a Stmt
+                }
             } is IrWhen -> {
                 val x: IrWhen = s
                 if(s.origin == IF) {
diff --git a/java/ql/test/kotlin/library-tests/stmts/stmts.expected b/java/ql/test/kotlin/library-tests/stmts/stmts.expected
@@ -1,4 +1,5 @@
-| stmts.kt:2:41:8:1 | { ... } |
+| stmts.kt:2:41:10:1 | { ... } |
 | stmts.kt:3:8:3:12 | if (...) |
 | stmts.kt:4:15:4:19 | if (...) |
-| stmts.kt:7:5:7:16 | return ... |
+| stmts.kt:7:5:8:16 | while (...) |
+| stmts.kt:9:5:9:16 | return ... |
diff --git a/java/ql/test/kotlin/library-tests/stmts/stmts.kt b/java/ql/test/kotlin/library-tests/stmts/stmts.kt
@@ -4,6 +4,8 @@ fun topLevelMethod(x: Int, y: Int): Int {
     } else if(x < y) {
     } else {
     }
+    while(x > y)
+        return x
     return x + y
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ fun topLevelMethod(x: Int, y: Int): Int {`
`4`	`4`	`} else if(x < y) {`
`5`	`5`	`} else {`
`6`	`6`	`}`
	`7`	`+ while(x > y)`
	`8`	`+ return x`
`7`	`9`	`return x + y`
`8`	`10`	`}`
`9`	`11`