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

Kotlin: Accept test changes following "casting" operator changes

Browse Source
This commit is contained in:
Ian Lynagh
2022-01-17 17:49:08 +00:00
parent 6566f7b69f
commit 579c590ea6
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/ql/test/kotlin/library-tests/classes/PrintAst.expected
View File

@@ -534,7 +534,7 @@ local_anonymous.kt:
# 25| 1: [ExprStmt] <Expr>;
# 25| 0: [MethodAccess] <obinit>(...)
# 26| 1: [ExprStmt] <Expr>;
# 26| 0: [CastExpr] (...)...
# 26| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 26| 0: [TypeAccess] Unit
# 26| 1: [ClassInstanceExpr] new LocalClass(...)
# 26| -3: [TypeAccess] LocalClass

2
java/ql/test/kotlin/library-tests/controlflow/basic/bbStmts.expected
View File

@@ -91,7 +91,7 @@
| Test.kt:38:16:41:3 | { ... } | 13 | Test.kt:40:4:40:4 | ...=... |
| Test.kt:38:16:41:3 | { ... } | 14 | Test.kt:40:4:40:6 | <Expr>; |
| Test.kt:38:16:41:3 | { ... } | 15 | Test.kt:40:4:40:6 | tmp0 |
| Test.kt:38:16:41:3 | { ... } | 16 | Test.kt:40:4:40:6 | (...)... |
| Test.kt:38:16:41:3 | { ... } | 16 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
| Test.kt:43:3:43:3 | <Expr>; | 0 | Test.kt:43:3:43:3 | <Expr>; |
| Test.kt:43:3:43:3 | <Expr>; | 1 | Test.kt:43:7:43:8 | 30 |
| Test.kt:43:3:43:3 | <Expr>; | 2 | Test.kt:43:3:43:3 | ...=... |

4
java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
View File

@@ -106,13 +106,13 @@
| Test.kt:40:4:40:4 | var ...; | LocalVariableDeclStmt | Test.kt:40:4:40:4 | x | VarAccess |
| Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:4 | tmp0 | LocalVariableDeclExpr |
| Test.kt:40:4:40:4 | x | VarAccess | file://:0:0:0:0 | <none> | <none> |
| Test.kt:40:4:40:6 | (...)... | CastExpr | Test.kt:38:9:38:9 | x | VarAccess |
| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <Stmt> | StmtExpr |
| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
| Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | { ... } | BlockStmt |
| Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr | Test.kt:38:9:38:9 | x | VarAccess |
| Test.kt:40:4:40:6 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
| Test.kt:40:4:40:6 | dec(...) | MethodAccess | Test.kt:40:4:40:4 | ...=... | AssignExpr |
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | (...)... | CastExpr |
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodAccess |
| Test.kt:40:4:40:6 | { ... } | BlockStmt | Test.kt:40:4:40:4 | var ...; | LocalVariableDeclStmt |
| Test.kt:43:3:43:3 | ...=... | AssignExpr | Test.kt:73:3:73:3 | <Expr>; | ExprStmt |

6
java/ql/test/kotlin/library-tests/controlflow/dominance/dominator.expected
View File

@@ -84,7 +84,7 @@
| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
| Test.kt:40:4:40:6 | <Stmt> | Test.kt:40:4:40:6 | { ... } |
| Test.kt:40:4:40:6 | dec(...) | Test.kt:40:4:40:4 | ...=... |
| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | (...)... |
| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | dec(...) |
| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:4 | var ...; |
| Test.kt:43:3:43:3 | ...=... | Test.kt:73:3:73:3 | <Expr>; |
@@ -100,8 +100,8 @@
| Test.kt:73:8:73:8 | x | Test.kt:73:12:73:12 | y |
| Test.kt:73:8:73:12 | ... + ... | Test.kt:73:16:73:16 | w |
| Test.kt:73:8:73:16 | ... + ... | Test.kt:73:3:73:16 | plus(...) |
| Test.kt:73:12:73:12 | (...)... | Test.kt:73:8:73:12 | ... + ... |
| Test.kt:73:12:73:12 | y | Test.kt:73:12:73:12 | (...)... |
| Test.kt:73:12:73:12 | <implicit cast> | Test.kt:73:8:73:12 | ... + ... |
| Test.kt:73:12:73:12 | y | Test.kt:73:12:73:12 | <implicit cast> |
| Test.kt:73:16:73:16 | w | Test.kt:73:8:73:16 | ... + ... |
| Test.kt:77:3:77:3 | ...=... | Test.kt:78:10:78:10 | w |
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:77:7:77:8 | 40 |

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

@@ -600,7 +600,7 @@ exprs.kt:
# 131| 1: [IntegerLiteral] 0
# 131| 1: [BlockStmt] { ... }
# 132| 0: [ExprStmt] <Expr>;
# 132| 0: [CastExpr] (...)...
# 132| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 132| 0: [TypeAccess] Unit
# 132| 1: [StmtExpr] <Stmt>
# 132| 0: [BlockStmt] { ... }
@@ -638,7 +638,7 @@ exprs.kt:
# 151| 1: [BlockStmt] { ... }
# 152| 0: [LocalVariableDeclStmt] var ...;
# 152| 1: [LocalVariableDeclExpr] x1
# 152| 0: [CastExpr] (...)...
# 152| 0: [ImplicitCastExpr] <implicit cast>
# 152| 0: [TypeAccess] Subclass1
# 152| 1: [VarAccess] x
# 154| 1: [LocalVariableDeclStmt] var ...;
@@ -649,7 +649,7 @@ exprs.kt:
# 154| 0: [VarAccess] x
# 154| 1: [TypeAccess] Subclass1
# 154| 1: [ExprStmt] <Expr>;
# 154| 0: [CastExpr] (...)...
# 154| 0: [ImplicitCastExpr] <implicit cast>
# 154| 0: [TypeAccess] Subclass1
# 154| 1: [StmtExpr] <Stmt>
# 154| 0: [BlockStmt] { ... }
@@ -698,7 +698,7 @@ exprs.kt:
# 161| 1: [BlockStmt] { ... }
# 162| 0: [LocalVariableDeclStmt] var ...;
# 162| 1: [LocalVariableDeclExpr] r2
# 162| 0: [CastExpr] (...)...
# 162| 0: [ImplicitNotNullExpr] <implicit not null>
# 162| 0: [TypeAccess] Rectangle
# 162| 1: [VarAccess] r
# 163| 1: [LocalVariableDeclStmt] var ...;
@@ -1194,7 +1194,7 @@ funcExprs.kt:
# 29| 21: [Parameter] a21
# 29| 5: [BlockStmt] { ... }
# 29| 0: [ExprStmt] <Expr>;
# 29| 0: [CastExpr] (...)...
# 29| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 29| 0: [TypeAccess] Unit
# 29| 1: [IntegerLiteral] 5
# 29| -3: [TypeAccess] Function22<Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Unit>
@@ -2015,7 +2015,7 @@ localFunctionCalls.kt:
# 6| 0: [VarAccess] x
# 6| 1: [IntegerLiteral] 6
# 7| 3: [ExprStmt] <Expr>;
# 7| 0: [CastExpr] (...)...
# 7| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 7| 0: [TypeAccess] Unit
# 7| 1: [MethodAccess] a(...)
# 7| -2: [TypeAccess] String
@@ -2041,7 +2041,7 @@ localFunctionCalls.kt:
# 9| 0: [ReturnStmt] return ...
# 9| 0: [IntegerLiteral] 5
# 10| 6: [ExprStmt] <Expr>;
# 10| 0: [CastExpr] (...)...
# 10| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 10| 0: [TypeAccess] Unit
# 10| 1: [MethodAccess] f1(...)
# 10| -2: [TypeAccess] Integer

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

@@ -463,8 +463,8 @@
| exprs.kt:132:9:132:16 | tmp0 | exprs.kt:4:1:136:1 | topLevelMethod | LocalVariableDeclExpr |
| exprs.kt:132:9:132:16 | variable | exprs.kt:4:1:136:1 | topLevelMethod | VarAccess |
| exprs.kt:132:9:132:16 | variable | exprs.kt:4:1:136:1 | topLevelMethod | VarAccess |
| exprs.kt:132:9:132:18 | (...)... | exprs.kt:4:1:136:1 | topLevelMethod | CastExpr |
| exprs.kt:132:9:132:18 | <Stmt> | exprs.kt:4:1:136:1 | topLevelMethod | StmtExpr |
| exprs.kt:132:9:132:18 | <implicit coercion to unit> | exprs.kt:4:1:136:1 | topLevelMethod | ImplicitCoercionToUnitExpr |
| exprs.kt:132:9:132:18 | Unit | exprs.kt:4:1:136:1 | topLevelMethod | TypeAccess |
| exprs.kt:132:9:132:18 | dec(...) | exprs.kt:4:1:136:1 | topLevelMethod | MethodAccess |
| exprs.kt:132:9:132:18 | tmp0 | exprs.kt:4:1:136:1 | topLevelMethod | VarAccess |
@@ -490,7 +490,7 @@
| exprs.kt:151:8:151:21 | ...instanceof... | exprs.kt:150:1:157:1 | typeTests | InstanceOfExpr |
| exprs.kt:151:8:151:21 | Subclass1 | exprs.kt:150:1:157:1 | typeTests | TypeAccess |
| exprs.kt:152:9:152:29 | x1 | exprs.kt:150:1:157:1 | typeTests | LocalVariableDeclExpr |
| exprs.kt:152:29:152:29 | (...)... | exprs.kt:150:1:157:1 | typeTests | CastExpr |
| exprs.kt:152:29:152:29 | <implicit cast> | exprs.kt:150:1:157:1 | typeTests | ImplicitCastExpr |
| exprs.kt:152:29:152:29 | Subclass1 | exprs.kt:150:1:157:1 | typeTests | TypeAccess |
| exprs.kt:152:29:152:29 | x | exprs.kt:150:1:157:1 | typeTests | VarAccess |
| exprs.kt:154:5:154:60 | y1 | exprs.kt:150:1:157:1 | typeTests | LocalVariableDeclExpr |
@@ -499,8 +499,8 @@
| exprs.kt:154:29:154:29 | x | exprs.kt:150:1:157:1 | typeTests | VarAccess |
| exprs.kt:154:29:154:42 | ...instanceof... | exprs.kt:150:1:157:1 | typeTests | InstanceOfExpr |
| exprs.kt:154:29:154:42 | Subclass1 | exprs.kt:150:1:157:1 | typeTests | TypeAccess |
| exprs.kt:154:45:154:49 | (...)... | exprs.kt:150:1:157:1 | typeTests | CastExpr |
| exprs.kt:154:45:154:49 | <Stmt> | exprs.kt:150:1:157:1 | typeTests | StmtExpr |
| exprs.kt:154:45:154:49 | <implicit cast> | exprs.kt:150:1:157:1 | typeTests | ImplicitCastExpr |
| exprs.kt:154:45:154:49 | Subclass1 | exprs.kt:150:1:157:1 | typeTests | TypeAccess |
| exprs.kt:154:47:154:47 | x | exprs.kt:150:1:157:1 | typeTests | VarAccess |
| exprs.kt:154:58:154:58 | y | exprs.kt:150:1:157:1 | typeTests | VarAccess |
@@ -525,7 +525,7 @@
| exprs.kt:161:8:161:16 | ... != ... | exprs.kt:159:1:166:1 | foo | NEExpr |
| exprs.kt:161:13:161:16 | null | exprs.kt:159:1:166:1 | foo | NullLiteral |
| exprs.kt:162:9:162:29 | r2 | exprs.kt:159:1:166:1 | foo | LocalVariableDeclExpr |
| exprs.kt:162:29:162:29 | (...)... | exprs.kt:159:1:166:1 | foo | CastExpr |
| exprs.kt:162:29:162:29 | <implicit not null> | exprs.kt:159:1:166:1 | foo | ImplicitNotNullExpr |
| exprs.kt:162:29:162:29 | Rectangle | exprs.kt:159:1:166:1 | foo | TypeAccess |
| exprs.kt:162:29:162:29 | r | exprs.kt:159:1:166:1 | foo | VarAccess |
| exprs.kt:163:9:163:30 | height | exprs.kt:159:1:166:1 | foo | LocalVariableDeclExpr |
@@ -683,7 +683,7 @@
| funcExprs.kt:29:29:29:112 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:29:29:29: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:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:111:29:111 | 5 | funcExprs.kt:29:29:29:112 | invoke | IntegerLiteral |
| funcExprs.kt:29:111:29:111 | (...)... | funcExprs.kt:29:29:29:112 | invoke | CastExpr |
| funcExprs.kt:29:111:29:111 | <implicit coercion to unit> | funcExprs.kt:29:29:29:112 | invoke | ImplicitCoercionToUnitExpr |
| funcExprs.kt:29:111:29:111 | Unit | funcExprs.kt:29:29:29:112 | invoke | TypeAccess |
| funcExprs.kt:30:5:30:117 | functionExpression23(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:30:26:30:26 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
@@ -1193,7 +1193,7 @@
| localFunctionCalls.kt:6:5:6:5 | ...=... | localFunctionCalls.kt:3:1:11:1 | x | AssignExpr |
| 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 | <implicit coercion to unit> | localFunctionCalls.kt:3:1:11:1 | x | ImplicitCoercionToUnitExpr |
| 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 |
@@ -1207,7 +1207,7 @@
| 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 | <implicit coercion to unit> | localFunctionCalls.kt:3:1:11:1 | x | ImplicitCoercionToUnitExpr |
| 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 |

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

@@ -10,7 +10,7 @@
| methods5.kt:6:3:6:3 | ...=... | AssignExpr |
| 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 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
| methods5.kt:7:3:7:15 | Object | TypeAccess |
| methods5.kt:7:3:7:15 | String | TypeAccess |
| methods5.kt:7:3:7:15 | Unit | TypeAccess |
@@ -24,7 +24,7 @@
| 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 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
| methods5.kt:10:13:10:18 | Integer | TypeAccess |
| methods5.kt:10:13:10:18 | Object | TypeAccess |
| methods5.kt:10:13:10:18 | Unit | TypeAccess |