Extract content of <obinit> methods

tamasvajk · igfoo · commit 76fd386055ff · 2022-05-10T18:46:00.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.expected b/java/ql/test/kotlin/library-tests/classes/classes.expected
@@ -4,5 +4,7 @@
 | classes.kt:12:1:15:1 | ClassFour |
 | classes.kt:17:1:18:1 | ClassFive |
 | classes.kt:28:1:30:1 | ClassSix |
+| classes.kt:34:1:47:1 | ClassSeven |
 | file://:0:0:0:0 | Any |
+| file://:0:0:0:0 | ClassesKt |
 | file://:0:0:0:0 | Unit |
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.kt b/java/ql/test/kotlin/library-tests/classes/classes.kt
@@ -29,3 +29,20 @@ class ClassSix(): ClassFour(), IF1, IF2 {
     constructor(i: Int): this(){ }
 }
 
+fun f(s: String) {}
+
+class ClassSeven {
+    constructor(i: String) {
+        f(i)
+    }
+    init {
+        f("init1")
+    }
+
+    val x: Int = 3
+
+    init {
+        f("init2")
+    }
+}
+
diff --git a/java/ql/test/kotlin/library-tests/classes/ctorCalls.expected b/java/ql/test/kotlin/library-tests/classes/ctorCalls.expected
@@ -7,3 +7,4 @@ superCall
 | classes.kt:12:23:12:34 | super(...) |
 | classes.kt:17:18:17:28 | super(...) |
 | classes.kt:28:19:28:29 | super(...) |
+| classes.kt:35:27:35:26 | super(...) |
diff --git a/java/ql/test/kotlin/library-tests/classes/initBlocks.expected b/java/ql/test/kotlin/library-tests/classes/initBlocks.expected
@@ -0,0 +1,24 @@
+initBlocks
+| classes.kt:2:1:2:18 | <obinit> |
+| classes.kt:4:1:6:1 | <obinit> |
+| classes.kt:8:1:10:1 | <obinit> |
+| classes.kt:12:1:15:1 | <obinit> |
+| classes.kt:17:1:18:1 | <obinit> |
+| classes.kt:20:1:22:1 | <obinit> |
+| classes.kt:24:1:26:1 | <obinit> |
+| classes.kt:28:1:30:1 | <obinit> |
+| classes.kt:34:1:47:1 | <obinit> |
+initCall
+| classes.kt:2:1:2:18 | <obinit>(...) |
+| classes.kt:4:1:6:1 | <obinit>(...) |
+| classes.kt:8:1:10:1 | <obinit>(...) |
+| classes.kt:12:1:15:1 | <obinit>(...) |
+| classes.kt:17:1:18:1 | <obinit>(...) |
+| classes.kt:28:1:30:1 | <obinit>(...) |
+| classes.kt:35:5:37:5 | <obinit>(...) |
+initExpressions
+| classes.kt:4:17:4:28 | ...=... | 0 |
+| classes.kt:5:5:5:18 | ...=... | 1 |
+| classes.kt:39:9:39:18 | f(...) | 0 |
+| classes.kt:42:5:42:18 | ...=... | 1 |
+| classes.kt:45:9:45:18 | f(...) | 2 |
diff --git a/java/ql/test/kotlin/library-tests/classes/initBlocks.ql b/java/ql/test/kotlin/library-tests/classes/initBlocks.ql
@@ -0,0 +1,9 @@
+import java
+
+query predicate initBlocks(Method m) { m.hasName("<obinit>") }
+
+query predicate initCall(MethodAccess ma) { ma.getMethod().hasName("<obinit>") }
+
+query predicate initExpressions(Expr e, int i) {
+  exists(Method m | m.hasName("<obinit>") | e.getParent() = m.getBody() and i = e.getIndex())
+}
diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.expected b/java/ql/test/kotlin/library-tests/classes/superTypes.expected
@@ -6,4 +6,5 @@
 | classes.kt:28:1:30:1 | ClassSix | classes.kt:12:1:15:1 | ClassFour |
 | classes.kt:28:1:30:1 | ClassSix | classes.kt:20:1:22:1 | IF1 |
 | classes.kt:28:1:30:1 | ClassSix | classes.kt:24:1:26:1 | IF2 |
+| classes.kt:34:1:47:1 | ClassSeven | file://:0:0:0:0 | Any |
 | file://:0:0:0:0 | Unit | file://:0:0:0:0 | Any |
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.expected b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
@@ -44,6 +44,9 @@
 | exprs.kt:50:13:50:16 | true | BooleanLiteral |
 | exprs.kt:50:13:50:23 | ::class | ClassExpr |
 | exprs.kt:53:1:55:1 | <obinit>(...) | MethodAccess |
+| exprs.kt:53:9:53:18 | ...=... | AssignExpr |
+| exprs.kt:53:9:53:18 | n | VarAccess |
+| exprs.kt:53:9:53:18 | n | VarAccess |
 | exprs.kt:54:27:54:31 | (no string representation) | ClassInstanceExpr |
 | exprs.kt:54:29:54:30 | 42 | IntegerLiteral |
 | file://:0:0:0:0 | b1 | LocalVariableDeclExpr |
diff --git a/java/ql/test/kotlin/library-tests/methods/methods.expected b/java/ql/test/kotlin/library-tests/methods/methods.expected
@@ -1,7 +1,5 @@
 methods
 | file://:0:0:0:0 | <init> |
-| file://:0:0:0:0 | <obinit> |
-| file://:0:0:0:0 | <obinit> |
 | file://:0:0:0:0 | equals |
 | file://:0:0:0:0 | equals |
 | file://:0:0:0:0 | hashCode |
diff --git a/java/ql/test/kotlin/library-tests/variables/variableAccesses.expected b/java/ql/test/kotlin/library-tests/variables/variableAccesses.expected
@@ -1,4 +1,7 @@
 varAcc
+| variables.kt:3:5:3:21 | prop |
+| variables.kt:16:11:16:18 | o |
+| variables.kt:16:11:16:18 | o |
 instAcc
 | variables.kt:21:11:21:15 | this |
 | variables.kt:24:9:24:8 | this |
