Kotlin: Add blocks

igfoo · igfoo · commit 0c429e4f8008 · 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
@@ -34,6 +34,7 @@ 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.expressions.IrBlock
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 
@@ -338,6 +339,14 @@ class KotlinFileExtractor(val tw: TrapWriter) {
                 tw.writeStmts_returnstmt(id, parent, idx, callable)
                 tw.writeHasLocation(id, locId)
                 extractExpression(e.value, callable, id, 0)
+            } is IrBlock -> {
+                val id = tw.getFreshIdLabel<DbBlock>()
+                val locId = tw.getLocation(e.startOffset, e.endOffset)
+                tw.writeStmts_block(id, parent, idx, callable)
+                tw.writeHasLocation(id, locId)
+                e.statements.forEachIndexed { i, s ->
+                    extractStatement(s, callable, id, i)
+                }
             } is IrWhileLoop -> {
                 val id = tw.getFreshIdLabel<DbWhilestmt>()
                 val locId = tw.getLocation(e.startOffset, e.endOffset)
diff --git a/java/ql/test/kotlin/library-tests/stmts/stmts.expected b/java/ql/test/kotlin/library-tests/stmts/stmts.expected
@@ -1,6 +1,11 @@
-| stmts.kt:2:41:10:1 | { ... } |
+| stmts.kt:2:41:13:1 | { ... } |
 | stmts.kt:3:8:3:12 | if (...) |
+| stmts.kt:3:15:4:5 | { ... } |
 | stmts.kt:4:15:4:19 | if (...) |
+| stmts.kt:4:22:5:5 | { ... } |
 | stmts.kt:7:5:8:16 | while (...) |
 | stmts.kt:8:9:8:16 | return ... |
-| stmts.kt:9:5:9:16 | return ... |
+| stmts.kt:9:5:11:5 | while (...) |
+| stmts.kt:9:18:11:5 | { ... } |
+| stmts.kt:10:9:10:16 | return ... |
+| stmts.kt:12:5:12:16 | return ... |
diff --git a/java/ql/test/kotlin/library-tests/stmts/stmts.kt b/java/ql/test/kotlin/library-tests/stmts/stmts.kt
@@ -6,6 +6,9 @@ fun topLevelMethod(x: Int, y: Int): Int {
     }
     while(x > y)
         return x
+    while(x < y) {
+        return y
+    }
     return x + y
 }
 

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