Kotlin: More expressions

igfoo · igfoo · commit bb89b25e918a · 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
@@ -471,6 +471,20 @@ class KotlinFileExtractor(val tw: TrapWriter) {
                         tw.writeExprs_booleanliteral(id, typeId, parent, idx)
                         tw.writeHasLocation(id, locId)
                         tw.writeNamestrings(v.toString(), v.toString(), id)
+                    } is Char -> {
+                        val id = tw.getFreshIdLabel<DbCharacterliteral>()
+                        val typeId = useType(e.type)
+                        val locId = tw.getLocation(e.startOffset, e.endOffset)
+                        tw.writeExprs_characterliteral(id, typeId, parent, idx)
+                        tw.writeHasLocation(id, locId)
+                        tw.writeNamestrings(v.toString(), v.toString(), id)
+                    } is String -> {
+                        val id = tw.getFreshIdLabel<DbStringliteral>()
+                        val typeId = useType(e.type)
+                        val locId = tw.getLocation(e.startOffset, e.endOffset)
+                        tw.writeExprs_stringliteral(id, typeId, parent, idx)
+                        tw.writeHasLocation(id, locId)
+                        tw.writeNamestrings(v.toString(), v.toString(), id)
                     } else -> {
                         if(v == null) {
                             extractorBug("Unrecognised IrConst: null value")
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.expected b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
@@ -32,14 +32,17 @@
 | exprs.kt:20:20:20:20 | y |
 | exprs.kt:23:14:23:17 | true |
 | exprs.kt:24:14:24:18 | false |
-| exprs.kt:28:12:28:14 | 123 |
-| exprs.kt:28:12:28:20 | ... + ... |
-| exprs.kt:28:18:28:20 | 456 |
+| exprs.kt:28:13:28:15 | x |
+| exprs.kt:29:16:29:25 | string lit |
+| exprs.kt:30:12:30:14 | 123 |
+| exprs.kt:30:12:30:20 | ... + ... |
+| exprs.kt:30:18:30:20 | 456 |
 | file://:0:0:0:0 | b1 |
 | file://:0:0:0:0 | b2 |
 | file://:0:0:0:0 | b3 |
 | file://:0:0:0:0 | b4 |
 | file://:0:0:0:0 | b5 |
+| file://:0:0:0:0 | c |
 | file://:0:0:0:0 | i1 |
 | file://:0:0:0:0 | i2 |
 | file://:0:0:0:0 | i3 |
@@ -60,3 +63,4 @@
 | file://:0:0:0:0 | i18 |
 | file://:0:0:0:0 | i20 |
 | file://:0:0:0:0 | i21 |
+| file://:0:0:0:0 | str |
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.kt b/java/ql/test/kotlin/library-tests/exprs/exprs.kt
@@ -25,6 +25,8 @@ fun topLevelMethod(x: Int, y: Int): Int {
     val b3 = b1 && b2
     val b4 = b1 || b2
     val b5 = !b1
+    val c = 'x'
+    val str = "string lit"
     return 123 + 456
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ fun topLevelMethod(x: Int, y: Int): Int {`
`25`	`25`	`val b3 = b1 && b2`
`26`	`26`	`val b4 = b1 \|\| b2`
`27`	`27`	`val b5 = !b1`
	`28`	`+ val c = 'x'`
	`29`	`+ val str = "string lit"`
`28`	`30`	`return 123 + 456`
`29`	`31`	`}`
`30`	`32`