Kotlin: Variable initialisers

igfoo · igfoo · commit 3daec4376fd3 · 2022-05-10T18:45:53.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -319,15 +319,19 @@ class KotlinFileExtractor(val tw: TrapWriter) {
         }
     }
 
-    fun extractVariable(v: IrVariable, parent: Label<out DbStmtparent>, idx: Int) {
-        val id = tw.getFreshIdLabel<DbLocalvariabledeclexpr>()
+    fun extractVariable(v: IrVariable, callable: Label<out DbCallable>) {
+        val id = tw.getFreshIdLabel<DbLocalvar>()
         val locId = tw.getLocation(v.startOffset, v.endOffset)
         val typeId = useType(v.type)
-        tw.writeExprs_localvariabledeclexpr(id, typeId, parent, idx)
+        val decId = tw.getFreshIdLabel<DbLocalvariabledeclexpr>()
+        tw.writeLocalvars(id, v.name.asString(), typeId, decId)
         tw.writeHasLocation(id, locId)
-        val varId = tw.getFreshIdLabel<DbLocalvar>()
-        tw.writeLocalvars(varId, v.name.asString(), typeId, id)
-        tw.writeHasLocation(varId, locId)
+        tw.writeExprs_localvariabledeclexpr(decId, typeId, id, 0)
+        tw.writeHasLocation(id, locId)
+        val i = v.initializer
+        if(i != null) {
+            extractExpression(i, callable, decId, 0)
+        }
     }
 
     fun extractStatement(s: IrStatement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
@@ -336,7 +340,7 @@ class KotlinFileExtractor(val tw: TrapWriter) {
                 extractExpression(s, callable, parent, idx)
             }
             is IrVariable -> {
-                extractVariable(s, parent, idx)
+                extractVariable(s, callable)
             }
             else -> {
                 extractorBug("Unrecognised IrStatement: " + s.javaClass)
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.expected b/java/ql/test/kotlin/library-tests/variables/variables.expected
@@ -1,6 +1,6 @@
-| variables.kt:0:0:0:0 | other | variables.kt:0:0:0:0 | Any |
-| variables.kt:0:0:0:0 | other | variables.kt:0:0:0:0 | Any |
-| variables.kt:2:1:8:1 | other | variables.kt:0:0:0:0 | Any |
-| variables.kt:3:5:3:21 | prop | file://:0:0:0:0 | int |
-| variables.kt:5:20:5:29 | param | file://:0:0:0:0 | int |
-| variables.kt:6:9:6:21 | int local | file://:0:0:0:0 | int |
+| variables.kt:0:0:0:0 | other | variables.kt:0:0:0:0 | Any | file://:0:0:0:0 | <none> |
+| variables.kt:0:0:0:0 | other | variables.kt:0:0:0:0 | Any | file://:0:0:0:0 | <none> |
+| variables.kt:2:1:8:1 | other | variables.kt:0:0:0:0 | Any | file://:0:0:0:0 | <none> |
+| variables.kt:3:5:3:21 | prop | file://:0:0:0:0 | int | file://:0:0:0:0 | <none> |
+| variables.kt:5:20:5:29 | param | file://:0:0:0:0 | int | file://:0:0:0:0 | <none> |
+| variables.kt:6:9:6:25 | int local | file://:0:0:0:0 | int | variables.kt:6:21:6:25 | ... + ... |
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.kt b/java/ql/test/kotlin/library-tests/variables/variables.kt
@@ -3,7 +3,7 @@ class Foo {
     val prop: Int = 1
 
     fun myFunction(param: Int) {
-        val local = 2
+        val local = 2 + 3
     }
 }
 
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.ql b/java/ql/test/kotlin/library-tests/variables/variables.ql
@@ -1,5 +1,35 @@
 import java
 
+newtype TMaybeExpr =
+  TExpr(Expr c) or
+  TNoExpr()
+
+class MaybeExpr extends TMaybeExpr {
+  abstract string toString();
+  abstract Location getLocation();
+}
+
+class YesMaybeExpr extends MaybeExpr {
+  Expr c;
+
+  YesMaybeExpr() { this = TExpr(c) }
+  override string toString() { result = c.toString() }
+  override Location getLocation() { result = c.getLocation() }
+}
+
+class NoMaybeExpr extends MaybeExpr {
+  NoMaybeExpr() { this = TNoExpr() }
+
+  override string toString() { result = "<none>" }
+  override Location getLocation() { none() }
+}
+
+MaybeExpr initializer(Variable v) {
+  if exists(v.getInitializer())
+  then result = TExpr(v.getInitializer())
+  else result = TNoExpr()
+}
+
 from Variable v
-select v, v.getType()
+select v, v.getType(), initializer(v)
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ class Foo {`
`3`	`3`	`val prop: Int = 1`
`4`	`4`
`5`	`5`	`fun myFunction(param: Int) {`
`6`		`- val local = 2`
	`6`	`+ val local = 2 + 3`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`