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

Cleanup: use extractTypeAccess wherever possible

Browse Source
This commit is contained in:
Chris Smowton
2021-12-16 18:47:30 +00:00
committed by Ian Lynagh
parent 70841a5896
commit ef9a213ae1
8 changed files with 104 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
java/ql/test/kotlin/library-tests/arrays/arrayCreations.expected
View File

@@ -1,23 +1,23 @@
arrayCreationTypes
| arrayCreations.kt:5:14:5:33 | new Integer[] | file://:0:0:0:0 | Integer[] | file://:0:0:0:0 | Integer |
| arrayCreations.kt:6:14:6:32 | new Integer[] | file://:0:0:0:0 | Integer[] | file://:0:0:0:0 | Integer |
| arrayCreations.kt:7:14:7:46 | new double[] | file://:0:0:0:0 | double[] | file://:0:0:0:0 | double |
| arrayCreations.kt:8:14:8:49 | new float[] | file://:0:0:0:0 | float[] | file://:0:0:0:0 | float |
| arrayCreations.kt:9:14:9:36 | new long[] | file://:0:0:0:0 | long[] | file://:0:0:0:0 | long |
| arrayCreations.kt:10:14:10:35 | new int[] | file://:0:0:0:0 | int[] | file://:0:0:0:0 | int |
| arrayCreations.kt:11:14:11:34 | new char[] | file://:0:0:0:0 | char[] | file://:0:0:0:0 | char |
| arrayCreations.kt:12:14:12:37 | new short[] | file://:0:0:0:0 | short[] | file://:0:0:0:0 | short |
| arrayCreations.kt:13:14:13:36 | new byte[] | file://:0:0:0:0 | byte[] | file://:0:0:0:0 | byte |
| arrayCreations.kt:14:14:14:52 | new boolean[] | file://:0:0:0:0 | boolean[] | file://:0:0:0:0 | boolean |
| arrayCreations.kt:17:14:17:68 | new int[][] | file://:0:0:0:0 | int[][] | file://:0:0:0:0 | int[] |
| arrayCreations.kt:17:22:17:43 | new int[] | file://:0:0:0:0 | int[] | file://:0:0:0:0 | int |
| arrayCreations.kt:17:46:17:67 | new int[] | file://:0:0:0:0 | int[] | file://:0:0:0:0 | int |
| arrayCreations.kt:18:14:18:65 | new Object[] | file://:0:0:0:0 | Object[] | file://:0:0:0:0 | Object |
| arrayCreations.kt:18:22:18:43 | new int[] | file://:0:0:0:0 | int[] | file://:0:0:0:0 | int |
| arrayCreations.kt:18:46:18:64 | new Integer[] | file://:0:0:0:0 | Integer[] | file://:0:0:0:0 | Integer |
| arrayCreations.kt:19:14:19:62 | new Integer[][] | file://:0:0:0:0 | Integer[][] | file://:0:0:0:0 | Integer[] |
| arrayCreations.kt:19:22:19:40 | new Integer[] | file://:0:0:0:0 | Integer[] | file://:0:0:0:0 | Integer |
| arrayCreations.kt:19:43:19:61 | new Integer[] | file://:0:0:0:0 | Integer[] | file://:0:0:0:0 | Integer |
| arrayCreations.kt:5:14:5:33 | new Integer[] | file://:0:0:0:0 | Integer[] | arrayCreations.kt:5:14:5:33 | Integer |
| arrayCreations.kt:6:14:6:32 | new Integer[] | file://:0:0:0:0 | Integer[] | arrayCreations.kt:6:14:6:32 | Integer |
| arrayCreations.kt:7:14:7:46 | new double[] | file://:0:0:0:0 | double[] | arrayCreations.kt:7:14:7:46 | double |
| arrayCreations.kt:8:14:8:49 | new float[] | file://:0:0:0:0 | float[] | arrayCreations.kt:8:14:8:49 | float |
| arrayCreations.kt:9:14:9:36 | new long[] | file://:0:0:0:0 | long[] | arrayCreations.kt:9:14:9:36 | long |
| arrayCreations.kt:10:14:10:35 | new int[] | file://:0:0:0:0 | int[] | arrayCreations.kt:10:14:10:35 | int |
| arrayCreations.kt:11:14:11:34 | new char[] | file://:0:0:0:0 | char[] | arrayCreations.kt:11:14:11:34 | char |
| arrayCreations.kt:12:14:12:37 | new short[] | file://:0:0:0:0 | short[] | arrayCreations.kt:12:14:12:37 | short |
| arrayCreations.kt:13:14:13:36 | new byte[] | file://:0:0:0:0 | byte[] | arrayCreations.kt:13:14:13:36 | byte |
| arrayCreations.kt:14:14:14:52 | new boolean[] | file://:0:0:0:0 | boolean[] | arrayCreations.kt:14:14:14:52 | boolean |
| arrayCreations.kt:17:14:17:68 | new int[][] | file://:0:0:0:0 | int[][] | arrayCreations.kt:17:14:17:68 | int[] |
| arrayCreations.kt:17:22:17:43 | new int[] | file://:0:0:0:0 | int[] | arrayCreations.kt:17:22:17:43 | int |
| arrayCreations.kt:17:46:17:67 | new int[] | file://:0:0:0:0 | int[] | arrayCreations.kt:17:46:17:67 | int |
| arrayCreations.kt:18:14:18:65 | new Object[] | file://:0:0:0:0 | Object[] | arrayCreations.kt:18:14:18:65 | Object |
| arrayCreations.kt:18:22:18:43 | new int[] | file://:0:0:0:0 | int[] | arrayCreations.kt:18:22:18:43 | int |
| arrayCreations.kt:18:46:18:64 | new Integer[] | file://:0:0:0:0 | Integer[] | arrayCreations.kt:18:46:18:64 | Integer |
| arrayCreations.kt:19:14:19:62 | new Integer[][] | file://:0:0:0:0 | Integer[][] | arrayCreations.kt:19:14:19:62 | Integer[] |
| arrayCreations.kt:19:22:19:40 | new Integer[] | file://:0:0:0:0 | Integer[] | arrayCreations.kt:19:22:19:40 | Integer |
| arrayCreations.kt:19:43:19:61 | new Integer[] | file://:0:0:0:0 | Integer[] | arrayCreations.kt:19:43:19:61 | Integer |
arrayCreationDimensions
| arrayCreations.kt:5:14:5:33 | new Integer[] | arrayCreations.kt:5:32:5:32 | 1 | 0 |
| arrayCreations.kt:6:14:6:32 | new Integer[] | arrayCreations.kt:6:14:6:32 | 4 | 0 |

14
java/ql/test/kotlin/library-tests/classes/anonymousClasses.expected
View File

@@ -1,7 +1,7 @@
| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:66:20:66:54 | new (...) | | file://:0:0:0:0 | Object | classes.kt:66:20:66:54 | class ... |
| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:68:20:68:74 | new (...) | | file://:0:0:0:0 | Object | classes.kt:68:20:68:74 | class ... |
| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:72:16:77:10 | new (...) | | file://:0:0:0:0 | Object | classes.kt:72:16:77:10 | class ... |
| classes.kt:75:24:75:33 | new Object(...) { ... } | classes.kt:75:24:75:33 | new (...) | | file://:0:0:0:0 | Object | classes.kt:75:24:75:33 | class ... |
| classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:81:16:81:38 | new (...) | | file://:0:0:0:0 | Interface1 | classes.kt:81:16:81:38 | class ... |
| classes.kt:85:16:85:25 | new Object(...) { ... } | classes.kt:85:16:85:25 | new (...) | | file://:0:0:0:0 | Object | classes.kt:85:16:85:25 | class ... |
| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | classes.kt:89:16:89:44 | new (...) | | file://:0:0:0:0 | Interface3<Integer> | classes.kt:89:16:89:44 | class ... |
| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:66:20:66:54 | new (...) | | classes.kt:66:20:66:54 | Object | classes.kt:66:20:66:54 | class ... |
| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:68:20:68:74 | new (...) | | classes.kt:68:20:68:74 | Object | classes.kt:68:20:68:74 | class ... |
| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:72:16:77:10 | new (...) | | classes.kt:72:16:77:10 | Object | classes.kt:72:16:77:10 | class ... |
| classes.kt:75:24:75:33 | new Object(...) { ... } | classes.kt:75:24:75:33 | new (...) | | classes.kt:75:24:75:33 | Object | classes.kt:75:24:75:33 | class ... |
| classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:81:16:81:38 | new (...) | | classes.kt:81:16:81:38 | Interface1 | classes.kt:81:16:81:38 | class ... |
| classes.kt:85:16:85:25 | new Object(...) { ... } | classes.kt:85:16:85:25 | new (...) | | classes.kt:85:16:85:25 | Object | classes.kt:85:16:85:25 | class ... |
| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | classes.kt:89:16:89:44 | new (...) | | classes.kt:89:16:89:44 | Interface3<Integer> | classes.kt:89:16:89:44 | class ... |

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

@@ -480,6 +480,7 @@
| exprs.kt:142:9:142:18 | n | exprs.kt:142:1:144:1 | <obinit> | VarAccess |
| exprs.kt:142:9:142:18 | n | exprs.kt:142:1:144:1 | <obinit> | VarAccess |
| exprs.kt:142:9:142:18 | n | exprs.kt:142:9:142:18 | getN | VarAccess |
| exprs.kt:143:27:143:31 | C | exprs.kt:143:5:143:33 | foo | TypeAccess |
| exprs.kt:143:27:143:31 | new C(...) | exprs.kt:143:5:143:33 | foo | ClassInstanceExpr |
| exprs.kt:143:29:143:30 | 42 | exprs.kt:143:5:143:33 | foo | IntegerLiteral |
| exprs.kt:146:1:146:18 | <obinit>(...) | exprs.kt:146:6:146:18 | Root | MethodAccess |
@@ -534,8 +535,12 @@
| exprs.kt:164:9:164:17 | height | exprs.kt:159:1:166:1 | foo | VarAccess |
| exprs.kt:164:21:164:21 | 3 | exprs.kt:159:1:166:1 | foo | IntegerLiteral |
| exprs.kt:168:1:170:1 | <obinit>(...) | exprs.kt:168:6:170:1 | Direction | MethodAccess |
| exprs.kt:168:1:170:1 | Direction | exprs.kt:168:6:170:1 | Direction | TypeAccess |
| exprs.kt:168:1:170:1 | Unit | exprs.kt:168:6:170:1 | Direction | TypeAccess |
| exprs.kt:168:1:170:1 | new Enum(...) | exprs.kt:168:6:170:1 | Direction | ClassInstanceExpr |
| exprs.kt:172:1:176:1 | <obinit>(...) | exprs.kt:172:6:176:1 | Color | MethodAccess |
| exprs.kt:172:1:176:1 | Color | exprs.kt:172:6:176:1 | Color | TypeAccess |
| exprs.kt:172:1:176:1 | Unit | exprs.kt:172:6:176:1 | Color | TypeAccess |
| exprs.kt:172:1:176:1 | new Enum(...) | exprs.kt:172:6:176:1 | Color | ClassInstanceExpr |
| exprs.kt:172:18:172:29 | ...=... | exprs.kt:172:1:176:1 | <obinit> | AssignExpr |
| exprs.kt:172:18:172:29 | rgb | exprs.kt:172:1:176:1 | <obinit> | VarAccess |
@@ -554,6 +559,7 @@
| exprs.kt:188:18:188:18 | 2 | exprs.kt:187:13:192:5 | getObject | IntegerLiteral |
| exprs.kt:189:16:191:9 | <Stmt> | exprs.kt:187:13:192:5 | getObject | StmtExpr |
| exprs.kt:189:16:191:9 | <obinit>(...) | exprs.kt:189:16:191:9 | | MethodAccess |
| exprs.kt:189:16:191:9 | Interface1 | exprs.kt:187:13:192:5 | getObject | TypeAccess |
| exprs.kt:189:16:191:9 | new (...) | exprs.kt:187:13:192:5 | getObject | ClassInstanceExpr |
| exprs.kt:190:13:190:49 | ...=... | exprs.kt:189:16:191:9 | <obinit> | AssignExpr |
| exprs.kt:190:13:190:49 | a3 | exprs.kt:189:16:191:9 | <obinit> | VarAccess |
@@ -603,87 +609,74 @@
| exprs.kt:220:5:220:29 | x | exprs.kt:219:1:221:1 | fnClassRef | LocalVariableDeclExpr |
| exprs.kt:220:13:220:29 | SomeClass1 | exprs.kt:219:1:221:1 | fnClassRef | TypeAccess |
| exprs.kt:220:13:220:29 | SomeClass1.class | exprs.kt:219:1:221:1 | fnClassRef | TypeLiteral |
| file://:0:0:0:0 | C | exprs.kt:143:5:143:33 | foo | TypeAccess |
| file://:0:0:0:0 | C1<Integer> | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| file://:0:0:0:0 | Color | exprs.kt:172:6:176:1 | Color | TypeAccess |
| file://:0:0:0:0 | Direction | exprs.kt:168:6:170:1 | Direction | TypeAccess |
| file://:0:0:0:0 | Function0<Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function0<Object> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function0<Object> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function1<Integer,Double> | funcExprs.kt:25:28:25:51 | invoke | TypeAccess |
| file://:0:0:0:0 | Function1<Integer,Function1<Integer,Double>> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function1<Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function1<Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function1<Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function1<Object,Object> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function2<Integer,Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function2<Integer,Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function2<Integer,Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Function22<Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Unit> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | FunctionN<String> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Integer | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| file://:0:0:0:0 | Integer | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| file://:0:0:0:0 | Interface1 | exprs.kt:187:13:192:5 | getObject | TypeAccess |
| file://:0:0:0:0 | MyLambda | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| file://:0:0:0:0 | Object | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| file://:0:0:0:0 | Object | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| file://:0:0:0:0 | String | file://:0:0:0:0 | <none> | TypeAccess |
| file://:0:0:0:0 | String | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| file://:0:0:0:0 | Unit | exprs.kt:168:6:170:1 | Direction | TypeAccess |
| file://:0:0:0:0 | Unit | exprs.kt:172:6:176:1 | Color | TypeAccess |
| file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
| file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
| file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
| funcExprs.kt:14:5:14:33 | functionExpression0a(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:14:26:14:33 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:14:26:14:33 | Function0<Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:14:31:14:31 | 5 | funcExprs.kt:14:26:14:33 | invoke | IntegerLiteral |
| funcExprs.kt:15:5:15:33 | functionExpression0b(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:15:26:15:33 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:15:26:15:33 | Function0<Object> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:15:31:15:31 | 5 | funcExprs.kt:15:26:15:33 | invoke | IntegerLiteral |
| funcExprs.kt:16:5:16:33 | functionExpression0c(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:16:26:16:33 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:16:26:16:33 | Function0<Object> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:16:31:16:31 | 5 | funcExprs.kt:16:26:16:33 | invoke | IntegerLiteral |
| funcExprs.kt:17:5:17:38 | functionExpression1a(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:17:26:17:26 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:17:29:17:38 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:17:29:17:38 | Function1<Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:17:36:17:36 | 5 | funcExprs.kt:17:29:17:38 | invoke | IntegerLiteral |
| funcExprs.kt:18:5:18:34 | functionExpression1a(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:18:26:18:26 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:18:29:18:34 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:18:29:18:34 | Function1<Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:18:31:18:32 | it | funcExprs.kt:18:29:18:34 | invoke | VarAccess |
| funcExprs.kt:19:5:19:43 | functionExpression1a(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:19:26:19:26 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:19:29:19:42 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:19:29:19:42 | Function1<Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:19:42:19:42 | 5 | funcExprs.kt:19:29:19:42 | invoke | IntegerLiteral |
| funcExprs.kt:20:5:20:39 | functionExpression1a(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:20:26:20:26 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:20:29:20:38 | MyLambda | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:20:29:20:38 | new MyLambda(...) | funcExprs.kt:13:1:29:1 | call | ClassInstanceExpr |
| funcExprs.kt:21:5:21:37 | functionExpression1b(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:21:26:21:26 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:21:29:21:37 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:21:29:21:37 | Function1<Object,Object> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:21:36:21:36 | a | funcExprs.kt:21:29:21:37 | invoke | VarAccess |
| funcExprs.kt:22:5:22:51 | functionExpression2(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:22:25:22:25 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:22:28:22:50 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:22:28:22:50 | Function2<Integer,Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:22:50:22:50 | 5 | funcExprs.kt:22:28:22:50 | invoke | IntegerLiteral |
| funcExprs.kt:23:5:23:40 | functionExpression2(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:23:25:23:25 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:23:28:23:40 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:23:28:23:40 | Function2<Integer,Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:23:38:23:38 | 5 | funcExprs.kt:23:28:23:40 | invoke | IntegerLiteral |
| funcExprs.kt:24:5:24:44 | functionExpression3(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:24:25:24:25 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:24:28:24:44 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:24:28:24:44 | Function2<Integer,Integer,Integer> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:24:35:24:38 | this | funcExprs.kt:24:28:24:44 | invoke | ThisAccess |
| funcExprs.kt:24:35:24:42 | ... + ... | funcExprs.kt:24:28:24:44 | invoke | AddExpr |
| funcExprs.kt:24:42:24:42 | a | funcExprs.kt:24:28:24:44 | invoke | VarAccess |
| funcExprs.kt:25:5:25:51 | functionExpression4(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:25:25:25:25 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:25:28:25:51 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:25:28:25:51 | Function1<Integer,Function1<Integer,Double>> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:25:37:25:47 | ...->... | funcExprs.kt:25:28:25:51 | invoke | LambdaExpr |
| funcExprs.kt:25:37:25:47 | Function1<Integer,Double> | funcExprs.kt:25:28:25:51 | invoke | TypeAccess |
| funcExprs.kt:25:44:25:46 | 5.0 | funcExprs.kt:25:37:25:47 | invoke | DoubleLiteral |
| funcExprs.kt:27:5:27:112 | functionExpression22(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
| funcExprs.kt:27:26:27:26 | 5 | funcExprs.kt:13:1:29:1 | call | IntegerLiteral |
| funcExprs.kt:27:29:27:112 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:27:29:27:112 | Function22<Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Unit> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:27:111:27:111 | 5 | funcExprs.kt:27:29:27:112 | invoke | IntegerLiteral |
| funcExprs.kt:27:111:27:111 | (...)... | funcExprs.kt:27:29:27:112 | invoke | CastExpr |
| funcExprs.kt:27:111:27:111 | Unit | funcExprs.kt:27:29:27:112 | invoke | TypeAccess |
@@ -736,6 +729,7 @@
| funcExprs.kt:28:29:28:117 | (...)... | funcExprs.kt:28:29:28:117 | invoke | CastExpr |
| funcExprs.kt:28:29:28:117 | (...)... | funcExprs.kt:28:29:28:117 | invoke | CastExpr |
| funcExprs.kt:28:29:28:117 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
| funcExprs.kt:28:29:28:117 | FunctionN<String> | funcExprs.kt:13:1:29:1 | call | TypeAccess |
| funcExprs.kt:28:29:28:117 | args | funcExprs.kt:28:29:28:117 | invoke | VarAccess |
| funcExprs.kt:28:29:28:117 | args | funcExprs.kt:28:29:28:117 | invoke | VarAccess |
| funcExprs.kt:28:29:28:117 | args | funcExprs.kt:28:29:28:117 | invoke | VarAccess |
@@ -819,6 +813,8 @@
| localFunctionCalls.kt:6:5:6:5 | x | localFunctionCalls.kt:3:1:11:1 | x | VarAccess |
| localFunctionCalls.kt:6:9:6:9 | 6 | localFunctionCalls.kt:3:1:11:1 | x | IntegerLiteral |
| localFunctionCalls.kt:7:5:7:17 | (...)... | localFunctionCalls.kt:3:1:11:1 | x | CastExpr |
| localFunctionCalls.kt:7:5:7:17 | Object | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:7:5:7:17 | String | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:7:5:7:17 | Unit | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:7:5:7:17 | a(...) | localFunctionCalls.kt:3:1:11:1 | x | MethodAccess |
| localFunctionCalls.kt:7:5:7:17 | new (...) | localFunctionCalls.kt:3:1:11:1 | x | ClassInstanceExpr |
@@ -827,8 +823,12 @@
| localFunctionCalls.kt:8:5:8:5 | x | localFunctionCalls.kt:3:1:11:1 | x | VarAccess |
| localFunctionCalls.kt:8:9:8:9 | 7 | localFunctionCalls.kt:3:1:11:1 | x | IntegerLiteral |
| localFunctionCalls.kt:9:34:9:34 | 5 | localFunctionCalls.kt:9:5:9:34 | f1 | IntegerLiteral |
| localFunctionCalls.kt:10:5:10:13 | C1<Integer> | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:10:5:10:13 | Integer | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:10:5:10:13 | new C1<Integer>(...) | localFunctionCalls.kt:3:1:11:1 | x | ClassInstanceExpr |
| localFunctionCalls.kt:10:15:10:20 | (...)... | localFunctionCalls.kt:3:1:11:1 | x | CastExpr |
| localFunctionCalls.kt:10:15:10:20 | Integer | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:10:15:10:20 | Object | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:10:15:10:20 | Unit | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
| localFunctionCalls.kt:10:15:10:20 | f1(...) | localFunctionCalls.kt:3:1:11:1 | x | MethodAccess |
| localFunctionCalls.kt:10:15:10:20 | new (...) | localFunctionCalls.kt:3:1:11:1 | x | ClassInstanceExpr |

47
java/ql/test/kotlin/library-tests/extensions_recursion/element.expected
View File

@@ -1,23 +1,24 @@
| file://:0:0:0:0 | |
| test.kt:0:0:0:0 | TestKt |
| test.kt:0:0:0:0 | test |
| test.kt:2:1:4:1 | bar |
| test.kt:2:6:2:6 | T |
| test.kt:2:9:2:14 | <this> |
| test.kt:2:31:4:1 | { ... } |
| test.kt:3:5:3:15 | return ... |
| test.kt:3:12:3:15 | true |
| test.kt:6:1:10:1 | <Expr>; |
| test.kt:6:1:10:1 | <obinit> |
| test.kt:6:1:10:1 | <obinit>(...) |
| test.kt:6:1:10:1 | Foo |
| test.kt:6:1:10:1 | Foo |
| test.kt:6:1:10:1 | super(...) |
| test.kt:6:1:10:1 | { ... } |
| test.kt:6:1:10:1 | { ... } |
| test.kt:6:11:6:11 | T |
| test.kt:7:5:9:5 | foo |
| test.kt:7:24:9:5 | { ... } |
| test.kt:8:9:8:20 | return ... |
| test.kt:8:16:8:20 | bar(...) |
| test.kt:8:16:8:20 | this |
| file://:0:0:0:0 | | Package |
| test.kt:0:0:0:0 | TestKt | Class |
| test.kt:0:0:0:0 | test | CompilationUnit |
| test.kt:2:1:4:1 | bar | ExtensionMethod |
| test.kt:2:6:2:6 | T | TypeVariable |
| test.kt:2:9:2:14 | <this> | Parameter |
| test.kt:2:31:4:1 | { ... } | BlockStmt |
| test.kt:3:5:3:15 | return ... | ReturnStmt |
| test.kt:3:12:3:15 | true | BooleanLiteral |
| test.kt:6:1:10:1 | <Expr>; | ExprStmt |
| test.kt:6:1:10:1 | <obinit> | Method |
| test.kt:6:1:10:1 | <obinit>(...) | MethodAccess |
| test.kt:6:1:10:1 | Foo | Class, GenericType, ParameterizedType |
| test.kt:6:1:10:1 | Foo | Constructor |
| test.kt:6:1:10:1 | super(...) | SuperConstructorInvocationStmt |
| test.kt:6:1:10:1 | { ... } | BlockStmt |
| test.kt:6:1:10:1 | { ... } | BlockStmt |
| test.kt:6:11:6:11 | T | TypeVariable |
| test.kt:7:5:9:5 | foo | Method |
| test.kt:7:24:9:5 | { ... } | BlockStmt |
| test.kt:8:9:8:20 | return ... | ReturnStmt |
| test.kt:8:16:8:20 | T | TypeAccess |
| test.kt:8:16:8:20 | bar(...) | MethodAccess |
| test.kt:8:16:8:20 | this | ThisAccess |

2
java/ql/test/kotlin/library-tests/extensions_recursion/element.ql
View File

@@ -2,4 +2,4 @@ import java
from Element e
where e.fromSource()
select e
select e, concat(e.getAPrimaryQlClass(), ", ")

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

@@ -1,9 +1,3 @@
| file://:0:0:0:0 | C1<Integer> | TypeAccess |
| file://:0:0:0:0 | Integer | TypeAccess |
| file://:0:0:0:0 | Integer | TypeAccess |
| file://:0:0:0:0 | Object | TypeAccess |
| file://:0:0:0:0 | Object | TypeAccess |
| file://:0:0:0:0 | String | TypeAccess |
| methods2.kt:7:1:10:1 | <obinit>(...) | MethodAccess |
| methods3.kt:5:1:7:1 | <obinit>(...) | MethodAccess |
| methods4.kt:3:1:11:1 | <obinit>(...) | MethodAccess |
@@ -17,6 +11,8 @@
| methods5.kt:6:3:6:3 | x | VarAccess |
| methods5.kt:6:7:6:7 | 6 | IntegerLiteral |
| methods5.kt:7:3:7:15 | (...)... | CastExpr |
| methods5.kt:7:3:7:15 | Object | TypeAccess |
| methods5.kt:7:3:7:15 | String | TypeAccess |
| methods5.kt:7:3:7:15 | Unit | TypeAccess |
| methods5.kt:7:3:7:15 | a(...) | MethodAccess |
| methods5.kt:7:3:7:15 | new (...) | ClassInstanceExpr |
@@ -25,8 +21,12 @@
| methods5.kt:8:3:8:3 | x | VarAccess |
| methods5.kt:8:7:8:7 | 7 | IntegerLiteral |
| methods5.kt:9:32:9:32 | 5 | IntegerLiteral |
| methods5.kt:10:3:10:11 | C1<Integer> | TypeAccess |
| methods5.kt:10:3:10:11 | Integer | TypeAccess |
| methods5.kt:10:3:10:11 | new C1<Integer>(...) | ClassInstanceExpr |
| methods5.kt:10:13:10:18 | (...)... | CastExpr |
| methods5.kt:10:13:10:18 | Integer | TypeAccess |
| methods5.kt:10:13:10:18 | Object | TypeAccess |
| methods5.kt:10:13:10:18 | Unit | TypeAccess |
| methods5.kt:10:13:10:18 | f1(...) | MethodAccess |
| methods5.kt:10:13:10:18 | new (...) | ClassInstanceExpr |

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

@@ -1,4 +1,3 @@
| file://:0:0:0:0 | Exception | TypeAccess |
| stmts.kt:3:5:6:5 | when ... | WhenExpr |
| stmts.kt:3:8:3:8 | x | VarAccess |
| stmts.kt:3:8:3:12 | ... > ... | GTExpr |
@@ -57,6 +56,7 @@
| stmts.kt:28:11:28:11 | x | VarAccess |
| stmts.kt:28:11:28:15 | ... > ... | GTExpr |
| stmts.kt:28:15:28:15 | y | VarAccess |
| stmts.kt:34:15:34:30 | Exception | TypeAccess |
| stmts.kt:34:15:34:30 | new Exception(...) | ClassInstanceExpr |
| stmts.kt:34:26:34:28 | Foo | StringLiteral |
| stmts.kt:36:12:36:23 | Exception | TypeAccess |