Kotlin: Local variables

igfoo · igfoo · commit 799cf64fd228 · 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
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.declarations.IrProperty
+import org.jetbrains.kotlin.ir.declarations.IrVariable
 import org.jetbrains.kotlin.ir.util.dump
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.packageFqName
@@ -305,11 +306,25 @@ class KotlinFileExtractor(val tw: TrapWriter) {
         }
     }
 
+    fun extractVariable(v: IrVariable, parent: Label<out DbStmtparent>, idx: Int) {
+        val id = tw.getFreshIdLabel<DbLocalvariabledeclexpr>()
+        val locId = tw.getLocation(v.startOffset, v.endOffset)
+        val typeId = useType(v.type)
+        tw.writeExprs_localvariabledeclexpr(id, typeId, parent, idx)
+        tw.writeHasLocation(id, locId)
+        val varId = tw.getFreshIdLabel<DbLocalvar>()
+        tw.writeLocalvars(varId, v.name.asString(), typeId, id)
+        tw.writeHasLocation(varId, locId)
+    }
+
     fun extractStatement(s: IrStatement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
         when(s) {
             is IrExpression -> {
                 extractExpression(s, callable, parent, idx)
             }
+            is IrVariable -> {
+                extractVariable(s, parent, idx)
+            }
             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 +1,2 @@
-| variables.kt:3:5:3:21 | prop |
+| variables.kt:3:5:3:21 | prop | file://:0:0:0:0 | int |
+| variables.kt:6:9:6:21 | int local | file://:0:0:0:0 | int |
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.kt b/java/ql/test/kotlin/library-tests/variables/variables.kt
@@ -1,6 +1,10 @@
 
 class Foo {
     val prop: Int = 1
+
+    fun myFunction(param: Int) {
+        val local = 2
+    }
 }
 
 // TODO: val topLevel: Int = 1
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,5 @@
 import java
 
 from Variable v
-select v
+select v, v.getType()
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-\| variables.kt:3:5:3:21 \| prop \|`
	`1`	`+\| variables.kt:3:5:3:21 \| prop \| file://:0:0:0:0 \| int \|`
	`2`	`+\| variables.kt:6:9:6:21 \| int local \| file://:0:0:0:0 \| int \|`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`	`1`
`2`	`2`	`class Foo {`
`3`	`3`	`val prop: Int = 1`
	`4`	`+`
	`5`	`+ fun myFunction(param: Int) {`
	`6`	`+ val local = 2`
	`7`	`+ }`
`4`	`8`	`}`
`5`	`9`
`6`	`10`	`// TODO: val topLevel: Int = 1`