Kotlin: Add support for enum value accesses

igfoo · igfoo · commit 6c957284de19 · 2022-05-10T19:51:00.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -1520,6 +1520,17 @@ class X {
                     tw.writeVariableBinding(id, vId)
                 }
             }
+            is IrGetEnumValue -> {
+                val exprParent = parent.expr(e, callable)
+                val id = tw.getFreshIdLabel<DbVaraccess>()
+                val type = useType(e.type)
+                val locId = tw.getLocation(e)
+                tw.writeExprs_varaccess(id, type.javaResult.id, type.kotlinResult.id, exprParent.parent, exprParent.idx)
+                tw.writeHasLocation(id, locId)
+                val owner = e.symbol.owner
+                val vId = useEnumEntry(owner)
+                tw.writeVariableBinding(id, vId)
+            }
             is IrSetValue -> {
                 val exprParent = parent.expr(e, callable)
                 val id = tw.getFreshIdLabel<DbAssignexpr>()
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.expected b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
@@ -168,7 +168,9 @@
 | exprs.kt:92:18:92:29 | rgb | VarAccess |
 | exprs.kt:92:18:92:29 | rgb | VarAccess |
 | exprs.kt:99:5:99:31 | south | LocalVariableDeclExpr |
+| exprs.kt:99:27:99:31 | SOUTH | VarAccess |
 | exprs.kt:100:5:100:27 | green | LocalVariableDeclExpr |
+| exprs.kt:100:23:100:27 | GREEN | VarAccess |
 | file://:0:0:0:0 | Color | TypeAccess |
 | file://:0:0:0:0 | Direction | TypeAccess |
 | file://:0:0:0:0 | q | VarAccess |
