Kotlin: More top-level stuff

igfoo · igfoo · commit 4837e4e46af7 · 2022-05-10T18:45:54.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -386,7 +386,7 @@ class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter) {
         return id
     }
 
-    fun extractProperty(p: IrProperty, parentid: Label<out DbPackage_or_reftype>) {
+    fun extractProperty(p: IrProperty, parentid: Label<out DbReftype>) {
         val bf = p.backingField
         if(bf == null) {
             logger.warn("IrProperty without backing field")
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -319,7 +319,7 @@ fields(
   unique int id: @field,
   string nodeName: string ref,
   int typeid: @type ref,
-  int parentid: @package_or_reftype ref,
+  int parentid: @reftype ref,
   int sourceid: @field ref
 );
 
@@ -332,8 +332,6 @@ constrs(
   int sourceid: @constructor ref
 );
 
-@package_or_reftype = @package | @reftype
-
 methods(
   unique int id: @method,
   string nodeName: string ref,
diff --git a/java/ql/test/kotlin/library-tests/methods/exprs.expected b/java/ql/test/kotlin/library-tests/methods/exprs.expected
@@ -2,3 +2,6 @@
 | methods.kt:10:9:10:25 | this |
 | methods.kt:10:21:10:21 | a |
 | methods.kt:10:24:10:24 | 3 |
+| methods.kt:11:9:11:28 | topLevelMethod(...) |
+| methods.kt:11:24:11:24 | b |
+| methods.kt:11:27:11:27 | 4 |
diff --git a/java/ql/test/kotlin/library-tests/methods/methods.kt b/java/ql/test/kotlin/library-tests/methods/methods.kt
@@ -8,7 +8,7 @@ class Class {
 
     fun anotherClassMethod(a: Int, b: Int) {
         classMethod(a, 3)
-        // TODO topLevelMethod(b, 4)
+        topLevelMethod(b, 4)
     }
 }
 
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.expected b/java/ql/test/kotlin/library-tests/variables/variables.expected
@@ -4,3 +4,4 @@
 | 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 | ... + ... |
+| variables.kt:10:1:10:21 | topLevel | file://:0:0:0:0 | int | file://:0:0:0:0 | <none> |
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.kt b/java/ql/test/kotlin/library-tests/variables/variables.kt
@@ -7,5 +7,5 @@ class Foo {
     }
 }
 
-// TODO: val topLevel: Int = 1
+val topLevel: Int = 1
 

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter) {`
`386`	`386`	`return id`
`387`	`387`	`}`
`388`	`388`
`389`		`- fun extractProperty(p: IrProperty, parentid: Label<out DbPackage_or_reftype>) {`
	`389`	`+ fun extractProperty(p: IrProperty, parentid: Label<out DbReftype>) {`
`390`	`390`	`val bf = p.backingField`
`391`	`391`	`if(bf == null) {`
`392`	`392`	`logger.warn("IrProperty without backing field")`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class Class {`
`8`	`8`
`9`	`9`	`fun anotherClassMethod(a: Int, b: Int) {`
`10`	`10`	`classMethod(a, 3)`
`11`		`- // TODO topLevelMethod(b, 4)`
	`11`	`+ topLevelMethod(b, 4)`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ class Foo {`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`		`-// TODO: val topLevel: Int = 1`
	`10`	`+val topLevel: Int = 1`
`11`	`11`