hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-27 17:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor type access extraction

Browse Source
This commit is contained in:
Tamas Vajk
2022-03-03 09:25:52 +01:00
committed by Ian Lynagh
parent 92e59a3ae1
commit a8f595c50a
4 changed files with 136 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/ql/test/kotlin/library-tests/exprs/PrintAst.expected
View File

@@ -2368,6 +2368,8 @@ samConversion.kt:
# 2| 1: [VarAccess] <fn>
# 2| 1: [FieldDeclaration] Function1<Integer,Boolean> <fn>;
# 2| -1: [TypeAccess] Function1<Integer,Boolean>
# 2| 0: [TypeAccess] Integer
# 2| 1: [TypeAccess] Boolean
# 17| 3: [Method] accept
#-----| 4: (Parameters)
# 17| 0: [Parameter] i
@@ -2413,6 +2415,9 @@ samConversion.kt:
# 4| 1: [VarAccess] <fn>
# 4| 1: [FieldDeclaration] Function2<Integer,Integer,Unit> <fn>;
# 4| -1: [TypeAccess] Function2<Integer,Integer,Unit>
# 4| 0: [TypeAccess] Integer
# 4| 1: [TypeAccess] Integer
# 4| 2: [TypeAccess] Unit
# 23| 3: [Method] fn1
#-----| 4: (Parameters)
# 23| 0: [Parameter] i
@@ -2458,6 +2463,9 @@ samConversion.kt:
# 5| 1: [VarAccess] <fn>
# 5| 1: [FieldDeclaration] Function2<Integer,Integer,Unit> <fn>;
# 5| -1: [TypeAccess] Function2<Integer,Integer,Unit>
# 5| 0: [TypeAccess] Integer
# 5| 1: [TypeAccess] Integer
# 5| 2: [TypeAccess] Unit
# 23| 3: [Method] fn1
#-----| 4: (Parameters)
# 23| 0: [Parameter] i
@@ -2505,6 +2513,9 @@ samConversion.kt:
# 7| 1: [VarAccess] <fn>
# 7| 1: [FieldDeclaration] Function2<String,Integer,Boolean> <fn>;
# 7| -1: [TypeAccess] Function2<String,Integer,Boolean>
# 7| 0: [TypeAccess] String
# 7| 1: [TypeAccess] Integer
# 7| 2: [TypeAccess] Boolean
# 27| 3: [ExtensionMethod] ext
#-----| 4: (Parameters)
# 27| 0: [Parameter] <this>
@@ -2552,6 +2563,8 @@ samConversion.kt:
# 9| 1: [VarAccess] <fn>
# 9| 1: [FieldDeclaration] Function1<Integer,Boolean> <fn>;
# 9| -1: [TypeAccess] Function1<Integer,Boolean>
# 9| 0: [TypeAccess] Integer
# 9| 1: [TypeAccess] Boolean
# 17| 3: [Method] accept
#-----| 4: (Parameters)
# 17| 0: [Parameter] i
@@ -2845,6 +2858,7 @@ samConversion.kt:
# 42| 1: [VarAccess] <fn>
# 42| 2: [FieldDeclaration] FunctionN<Boolean> <fn>;
# 42| -1: [TypeAccess] FunctionN<Boolean>
# 42| 0: [TypeAccess] Boolean
# 42| -3: [TypeAccess] BigArityPredicate
# 42| 0: [VarAccess] a
# 43| 2: [LocalVariableDeclStmt] var ...;
@@ -2921,6 +2935,7 @@ samConversion.kt:
# 43| 1: [VarAccess] <fn>
# 43| 2: [FieldDeclaration] FunctionN<Boolean> <fn>;
# 43| -1: [TypeAccess] FunctionN<Boolean>
# 43| 0: [TypeAccess] Boolean
# 43| -3: [TypeAccess] BigArityPredicate
# 43| 0: [LambdaExpr] ...->...
# 43| -4: [AnonymousClass] new FunctionN<Boolean>(...) { ... }
@@ -3098,6 +3113,8 @@ samConversion.kt:
# 46| 1: [VarAccess] <fn>
# 46| 1: [FieldDeclaration] Function1<Integer,Boolean> <fn>;
# 46| -1: [TypeAccess] Function1<Integer,Boolean>
# 46| 0: [TypeAccess] Integer
# 46| 1: [TypeAccess] Boolean
# 50| 3: [Method] fn
#-----| 4: (Parameters)
# 50| 0: [Parameter] i

17
java/ql/test/kotlin/library-tests/exprs/exprs.expected
View File

@@ -1429,9 +1429,11 @@
| samConversion.kt:2:18:2:45 | ...=... | samConversion.kt:2:18:2:45 | | AssignExpr |
| samConversion.kt:2:18:2:45 | <fn> | samConversion.kt:2:18:2:45 | | VarAccess |
| samConversion.kt:2:18:2:45 | <fn> | samConversion.kt:17:5:17:31 | accept | VarAccess |
| samConversion.kt:2:18:2:45 | Boolean | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:2:18:2:45 | Function1<Integer,Boolean> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:2:18:2:45 | IntPredicate | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:2:18:2:45 | IntPredicate | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:2:18:2:45 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:2:18:2:45 | i | samConversion.kt:17:5:17:31 | accept | VarAccess |
| samConversion.kt:2:18:2:45 | invoke(...) | samConversion.kt:17:5:17:31 | accept | MethodAccess |
| samConversion.kt:2:18:2:45 | new (...) | samConversion.kt:1:1:14:1 | main | ClassInstanceExpr |
@@ -1452,8 +1454,11 @@
| samConversion.kt:4:14:4:42 | <fn> | samConversion.kt:4:14:4:42 | | VarAccess |
| samConversion.kt:4:14:4:42 | <fn> | samConversion.kt:23:5:23:27 | fn1 | VarAccess |
| samConversion.kt:4:14:4:42 | Function2<Integer,Integer,Unit> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:4:14:4:42 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:4:14:4:42 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:4:14:4:42 | InterfaceFn1 | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:4:14:4:42 | InterfaceFn1 | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:4:14:4:42 | Unit | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:4:14:4:42 | i | samConversion.kt:23:5:23:27 | fn1 | VarAccess |
| samConversion.kt:4:14:4:42 | invoke(...) | samConversion.kt:23:5:23:27 | fn1 | MethodAccess |
| samConversion.kt:4:14:4:42 | j | samConversion.kt:23:5:23:27 | fn1 | VarAccess |
@@ -1472,8 +1477,11 @@
| samConversion.kt:5:14:5:32 | <fn> | samConversion.kt:5:14:5:32 | | VarAccess |
| samConversion.kt:5:14:5:32 | <fn> | samConversion.kt:23:5:23:27 | fn1 | VarAccess |
| samConversion.kt:5:14:5:32 | Function2<Integer,Integer,Unit> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:5:14:5:32 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:5:14:5:32 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:5:14:5:32 | InterfaceFn1 | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:5:14:5:32 | InterfaceFn1 | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:5:14:5:32 | Unit | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:5:14:5:32 | i | samConversion.kt:23:5:23:27 | fn1 | VarAccess |
| samConversion.kt:5:14:5:32 | invoke(...) | samConversion.kt:23:5:23:27 | fn1 | MethodAccess |
| samConversion.kt:5:14:5:32 | j | samConversion.kt:23:5:23:27 | fn1 | VarAccess |
@@ -1494,9 +1502,12 @@
| samConversion.kt:7:13:7:46 | <fn> | samConversion.kt:7:13:7:46 | | VarAccess |
| samConversion.kt:7:13:7:46 | <fn> | samConversion.kt:27:5:27:35 | ext | VarAccess |
| samConversion.kt:7:13:7:46 | <this> | samConversion.kt:27:5:27:35 | ext | VarAccess |
| samConversion.kt:7:13:7:46 | Boolean | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:7:13:7:46 | Function2<String,Integer,Boolean> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:7:13:7:46 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:7:13:7:46 | InterfaceFnExt1 | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:7:13:7:46 | InterfaceFnExt1 | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:7:13:7:46 | String | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:7:13:7:46 | i | samConversion.kt:27:5:27:35 | ext | VarAccess |
| samConversion.kt:7:13:7:46 | invoke(...) | samConversion.kt:27:5:27:35 | ext | MethodAccess |
| samConversion.kt:7:13:7:46 | new (...) | samConversion.kt:1:1:14:1 | main | ClassInstanceExpr |
@@ -1515,9 +1526,11 @@
| samConversion.kt:9:13:13:6 | ...=... | samConversion.kt:9:13:13:6 | | AssignExpr |
| samConversion.kt:9:13:13:6 | <fn> | samConversion.kt:9:13:13:6 | | VarAccess |
| samConversion.kt:9:13:13:6 | <fn> | samConversion.kt:17:5:17:31 | accept | VarAccess |
| samConversion.kt:9:13:13:6 | Boolean | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:9:13:13:6 | Function1<Integer,Boolean> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:9:13:13:6 | IntPredicate | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:9:13:13:6 | IntPredicate | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:9:13:13:6 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:9:13:13:6 | i | samConversion.kt:17:5:17:31 | accept | VarAccess |
| samConversion.kt:9:13:13:6 | invoke(...) | samConversion.kt:17:5:17:31 | accept | MethodAccess |
| samConversion.kt:9:13:13:6 | new (...) | samConversion.kt:1:1:14:1 | main | ClassInstanceExpr |
@@ -1673,6 +1686,7 @@
| samConversion.kt:42:13:42:32 | <fn> | samConversion.kt:42:13:42:32 | | VarAccess |
| samConversion.kt:42:13:42:32 | BigArityPredicate | samConversion.kt:40:1:47:1 | fn | TypeAccess |
| samConversion.kt:42:13:42:32 | BigArityPredicate | samConversion.kt:40:1:47:1 | fn | TypeAccess |
| samConversion.kt:42:13:42:32 | Boolean | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:42:13:42:32 | FunctionN<Boolean> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:42:13:42:32 | Object | samConversion.kt:31:5:33:53 | accept | TypeAccess |
| samConversion.kt:42:13:42:32 | i0 | samConversion.kt:31:5:33:53 | accept | VarAccess |
@@ -1713,6 +1727,7 @@
| samConversion.kt:43:13:45:68 | <fn> | samConversion.kt:43:13:45:68 | | VarAccess |
| samConversion.kt:43:13:45:68 | BigArityPredicate | samConversion.kt:40:1:47:1 | fn | TypeAccess |
| samConversion.kt:43:13:45:68 | BigArityPredicate | samConversion.kt:40:1:47:1 | fn | TypeAccess |
| samConversion.kt:43:13:45:68 | Boolean | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:43:13:45:68 | FunctionN<Boolean> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:43:13:45:68 | Object | samConversion.kt:31:5:33:53 | accept | TypeAccess |
| samConversion.kt:43:13:45:68 | i0 | samConversion.kt:31:5:33:53 | accept | VarAccess |
@@ -1870,7 +1885,9 @@
| samConversion.kt:46:13:46:44 | ...=... | samConversion.kt:46:13:46:44 | | AssignExpr |
| samConversion.kt:46:13:46:44 | <fn> | samConversion.kt:46:13:46:44 | | VarAccess |
| samConversion.kt:46:13:46:44 | <fn> | samConversion.kt:50:5:50:25 | fn | VarAccess |
| samConversion.kt:46:13:46:44 | Boolean | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:46:13:46:44 | Function1<Integer,Boolean> | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:46:13:46:44 | Integer | file://:0:0:0:0 | <none> | TypeAccess |
| samConversion.kt:46:13:46:44 | Integer | samConversion.kt:40:1:47:1 | fn | TypeAccess |
| samConversion.kt:46:13:46:44 | Integer | samConversion.kt:40:1:47:1 | fn | TypeAccess |
| samConversion.kt:46:13:46:44 | SomePredicate<Integer> | samConversion.kt:40:1:47:1 | fn | TypeAccess |

8
java/ql/test/kotlin/library-tests/reflection/PrintAst.expected
View File

@@ -164,6 +164,8 @@ reflection.kt:
# 12| 0: [VarAccess] a0
# 12| 1: [FieldDeclaration] KProperty1<C,Integer> <dispatchReceiver>;
# 12| -1: [TypeAccess] KProperty1<C,Integer>
# 12| 0: [TypeAccess] C
# 12| 1: [TypeAccess] Integer
# 12| -3: [TypeAccess] Function1<C,Integer>
# 12| 0: [TypeAccess] C
# 12| 1: [TypeAccess] Integer
@@ -262,6 +264,8 @@ reflection.kt:
# 19| 1: [VarAccess] a1
# 19| 1: [FieldDeclaration] KMutableProperty1<C,Integer> <dispatchReceiver>;
# 19| -1: [TypeAccess] KMutableProperty1<C,Integer>
# 19| 0: [TypeAccess] C
# 19| 1: [TypeAccess] Integer
# 19| -3: [TypeAccess] Function2<C,Integer,Unit>
# 19| 0: [TypeAccess] C
# 19| 1: [TypeAccess] Integer
@@ -462,6 +466,7 @@ reflection.kt:
# 59| 0: [VarAccess] a0
# 59| 1: [FieldDeclaration] Generic<Integer> <dispatchReceiver>;
# 59| -1: [TypeAccess] Generic<Integer>
# 59| 0: [TypeAccess] Integer
# 59| -3: [TypeAccess] Function1<Integer,String>
# 59| 0: [TypeAccess] Integer
# 59| 1: [TypeAccess] String
@@ -512,6 +517,7 @@ reflection.kt:
# 61| -1: [ThisAccess] this
# 61| 1: [FieldDeclaration] Generic<Integer> <extensionReceiver>;
# 61| -1: [TypeAccess] Generic<Integer>
# 61| 0: [TypeAccess] Integer
# 61| -3: [TypeAccess] Function0<String>
# 61| 0: [TypeAccess] String
# 61| 0: [ClassInstanceExpr] new Generic<Integer>(...)
@@ -559,6 +565,7 @@ reflection.kt:
# 63| -1: [ThisAccess] this
# 63| 1: [FieldDeclaration] Generic<Integer> <extensionReceiver>;
# 63| -1: [TypeAccess] Generic<Integer>
# 63| 0: [TypeAccess] Integer
# 63| -3: [TypeAccess] Function0<String>
# 63| 0: [TypeAccess] String
# 63| 0: [ClassInstanceExpr] new Generic<Integer>(...)
@@ -609,6 +616,7 @@ reflection.kt:
# 66| 1: [VarAccess] <dispatchReceiver>
# 66| 1: [FieldDeclaration] Generic<Integer> <dispatchReceiver>;
# 66| -1: [TypeAccess] Generic<Integer>
# 66| 0: [TypeAccess] Integer
# 66| 1: [Method] get
# 66| 5: [BlockStmt] { ... }
# 66| 0: [ReturnStmt] return ...