Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2d8a2ab

Browse files
igfooigfoo
committed
Kotlin: Recognise more numeric types
1 parent 76151b4 commit 2d8a2ab

3 files changed

Lines changed: 27 additions & 12 deletions

File tree

‎java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,9 @@ open class KotlinFileExtractor(
608608

609609
fun isNumericFunction(fName: String): Boolean {
610610
return isFunction("kotlin", "Int", fName) ||
611+
isFunction("kotlin", "Short", fName) ||
612+
isFunction("kotlin", "Long", fName) ||
613+
isFunction("kotlin", "Float", fName) ||
611614
isFunction("kotlin", "Double", fName)
612615
}
613616

‎java/ql/test/kotlin/library-tests/exprs/binop.expected‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
| exprs.kt:47:16:47:25 | ... >= ... | exprs.kt:47:16:47:18 | byx | exprs.kt:47:23:47:25 | byy |
2323
| exprs.kt:48:16:48:26 | ... == ... | exprs.kt:48:16:48:18 | byx | exprs.kt:48:24:48:26 | byy |
2424
| exprs.kt:49:16:49:26 | ... != ... | exprs.kt:49:16:49:18 | byx | exprs.kt:49:24:49:26 | byy |
25+
| exprs.kt:52:14:52:20 | ... + ... | exprs.kt:52:14:52:15 | sx | exprs.kt:52:19:52:20 | sy |
26+
| exprs.kt:53:14:53:20 | ... - ... | exprs.kt:53:14:53:15 | sx | exprs.kt:53:19:53:20 | sy |
27+
| exprs.kt:54:14:54:20 | ... / ... | exprs.kt:54:14:54:15 | sx | exprs.kt:54:19:54:20 | sy |
28+
| exprs.kt:55:14:55:20 | ... % ... | exprs.kt:55:14:55:15 | sx | exprs.kt:55:19:55:20 | sy |
2529
| exprs.kt:56:14:56:21 | ... == ... | exprs.kt:56:14:56:15 | toInt(...) | exprs.kt:56:20:56:21 | toInt(...) |
2630
| exprs.kt:57:14:57:21 | ... != ... | exprs.kt:57:14:57:15 | toInt(...) | exprs.kt:57:20:57:21 | toInt(...) |
2731
| exprs.kt:58:14:58:20 | ... < ... | exprs.kt:58:14:58:15 | toInt(...) | exprs.kt:58:19:58:20 | toInt(...) |
@@ -30,6 +34,10 @@
3034
| exprs.kt:61:15:61:22 | ... >= ... | exprs.kt:61:15:61:16 | toInt(...) | exprs.kt:61:21:61:22 | toInt(...) |
3135
| exprs.kt:62:15:62:23 | ... == ... | exprs.kt:62:15:62:16 | sx | exprs.kt:62:22:62:23 | sy |
3236
| exprs.kt:63:15:63:23 | ... != ... | exprs.kt:63:15:63:16 | sx | exprs.kt:63:22:63:23 | sy |
37+
| exprs.kt:66:14:66:20 | ... + ... | exprs.kt:66:14:66:15 | lx | exprs.kt:66:19:66:20 | ly |
38+
| exprs.kt:67:14:67:20 | ... - ... | exprs.kt:67:14:67:15 | lx | exprs.kt:67:19:67:20 | ly |
39+
| exprs.kt:68:14:68:20 | ... / ... | exprs.kt:68:14:68:15 | lx | exprs.kt:68:19:68:20 | ly |
40+
| exprs.kt:69:14:69:20 | ... % ... | exprs.kt:69:14:69:15 | lx | exprs.kt:69:19:69:20 | ly |
3341
| exprs.kt:77:15:77:22 | ... == ... | exprs.kt:77:15:77:16 | lx | exprs.kt:77:21:77:22 | ly |
3442
| exprs.kt:78:15:78:22 | ... != ... | exprs.kt:78:15:78:16 | lx | exprs.kt:78:21:78:22 | ly |
3543
| exprs.kt:79:15:79:21 | ... < ... | exprs.kt:79:15:79:16 | lx | exprs.kt:79:20:79:21 | ly |
@@ -50,6 +58,10 @@
5058
| exprs.kt:96:15:96:22 | ... >= ... | exprs.kt:96:15:96:16 | dx | exprs.kt:96:21:96:22 | dy |
5159
| exprs.kt:97:15:97:23 | ... == ... | exprs.kt:97:15:97:16 | dx | exprs.kt:97:22:97:23 | dy |
5260
| exprs.kt:98:15:98:23 | ... != ... | exprs.kt:98:15:98:16 | dx | exprs.kt:98:22:98:23 | dy |
61+
| exprs.kt:101:14:101:20 | ... + ... | exprs.kt:101:14:101:15 | fx | exprs.kt:101:19:101:20 | fy |
62+
| exprs.kt:102:14:102:20 | ... - ... | exprs.kt:102:14:102:15 | fx | exprs.kt:102:19:102:20 | fy |
63+
| exprs.kt:103:14:103:20 | ... / ... | exprs.kt:103:14:103:15 | fx | exprs.kt:103:19:103:20 | fy |
64+
| exprs.kt:104:14:104:20 | ... % ... | exprs.kt:104:14:104:15 | fx | exprs.kt:104:19:104:20 | fy |
5365
| exprs.kt:105:14:105:21 | ... == ... | exprs.kt:105:14:105:15 | fx | exprs.kt:105:20:105:21 | fy |
5466
| exprs.kt:106:14:106:21 | ... != ... | exprs.kt:106:14:106:15 | fx | exprs.kt:106:20:106:21 | fy |
5567
| exprs.kt:107:14:107:20 | ... < ... | exprs.kt:107:14:107:15 | fx | exprs.kt:107:19:107:20 | fy |

‎java/ql/test/kotlin/library-tests/exprs/exprs.expected‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@
129129
| exprs.kt:51:14:51:16 | 1.0 | exprs.kt:4:1:139:1 | topLevelMethod | DoubleLiteral |
130130
| exprs.kt:52:5:52:20 | s2 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
131131
| exprs.kt:52:14:52:15 | sx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
132-
| exprs.kt:52:14:52:20 | plus(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
132+
| exprs.kt:52:14:52:20 | ... + ... | exprs.kt:4:1:139:1 | topLevelMethod | AddExpr |
133133
| exprs.kt:52:19:52:20 | sy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
134134
| exprs.kt:53:5:53:20 | s3 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
135135
| exprs.kt:53:14:53:15 | sx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
136-
| exprs.kt:53:14:53:20 | minus(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
136+
| exprs.kt:53:14:53:20 | ... - ... | exprs.kt:4:1:139:1 | topLevelMethod | SubExpr |
137137
| exprs.kt:53:19:53:20 | sy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
138138
| exprs.kt:54:5:54:20 | s4 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
139139
| exprs.kt:54:14:54:15 | sx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
140-
| exprs.kt:54:14:54:20 | div(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
140+
| exprs.kt:54:14:54:20 | ... / ... | exprs.kt:4:1:139:1 | topLevelMethod | DivExpr |
141141
| exprs.kt:54:19:54:20 | sy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
142142
| exprs.kt:55:5:55:20 | s5 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
143143
| exprs.kt:55:14:55:15 | sx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
144-
| exprs.kt:55:14:55:20 | rem(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
144+
| exprs.kt:55:14:55:20 | ... % ... | exprs.kt:4:1:139:1 | topLevelMethod | RemExpr |
145145
| exprs.kt:55:19:55:20 | sy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
146146
| exprs.kt:56:5:56:21 | s6 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
147147
| exprs.kt:56:14:56:15 | sx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
@@ -191,19 +191,19 @@
191191
| exprs.kt:65:14:65:16 | 1.0 | exprs.kt:4:1:139:1 | topLevelMethod | DoubleLiteral |
192192
| exprs.kt:66:5:66:20 | l2 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
193193
| exprs.kt:66:14:66:15 | lx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
194-
| exprs.kt:66:14:66:20 | plus(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
194+
| exprs.kt:66:14:66:20 | ... + ... | exprs.kt:4:1:139:1 | topLevelMethod | AddExpr |
195195
| exprs.kt:66:19:66:20 | ly | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
196196
| exprs.kt:67:5:67:20 | l3 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
197197
| exprs.kt:67:14:67:15 | lx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
198-
| exprs.kt:67:14:67:20 | minus(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
198+
| exprs.kt:67:14:67:20 | ... - ... | exprs.kt:4:1:139:1 | topLevelMethod | SubExpr |
199199
| exprs.kt:67:19:67:20 | ly | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
200200
| exprs.kt:68:5:68:20 | l4 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
201201
| exprs.kt:68:14:68:15 | lx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
202-
| exprs.kt:68:14:68:20 | div(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
202+
| exprs.kt:68:14:68:20 | ... / ... | exprs.kt:4:1:139:1 | topLevelMethod | DivExpr |
203203
| exprs.kt:68:19:68:20 | ly | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
204204
| exprs.kt:69:5:69:20 | l5 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
205205
| exprs.kt:69:14:69:15 | lx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
206-
| exprs.kt:69:14:69:20 | rem(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
206+
| exprs.kt:69:14:69:20 | ... % ... | exprs.kt:4:1:139:1 | topLevelMethod | RemExpr |
207207
| exprs.kt:69:19:69:20 | ly | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
208208
| exprs.kt:70:5:70:21 | l6 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
209209
| exprs.kt:70:14:70:15 | lx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
@@ -318,19 +318,19 @@
318318
| exprs.kt:100:14:100:16 | 1.0 | exprs.kt:4:1:139:1 | topLevelMethod | DoubleLiteral |
319319
| exprs.kt:101:5:101:20 | f2 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
320320
| exprs.kt:101:14:101:15 | fx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
321-
| exprs.kt:101:14:101:20 | plus(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
321+
| exprs.kt:101:14:101:20 | ... + ... | exprs.kt:4:1:139:1 | topLevelMethod | AddExpr |
322322
| exprs.kt:101:19:101:20 | fy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
323323
| exprs.kt:102:5:102:20 | f3 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
324324
| exprs.kt:102:14:102:15 | fx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
325-
| exprs.kt:102:14:102:20 | minus(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
325+
| exprs.kt:102:14:102:20 | ... - ... | exprs.kt:4:1:139:1 | topLevelMethod | SubExpr |
326326
| exprs.kt:102:19:102:20 | fy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
327327
| exprs.kt:103:5:103:20 | f4 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
328328
| exprs.kt:103:14:103:15 | fx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
329-
| exprs.kt:103:14:103:20 | div(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
329+
| exprs.kt:103:14:103:20 | ... / ... | exprs.kt:4:1:139:1 | topLevelMethod | DivExpr |
330330
| exprs.kt:103:19:103:20 | fy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
331331
| exprs.kt:104:5:104:20 | f5 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
332332
| exprs.kt:104:14:104:15 | fx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
333-
| exprs.kt:104:14:104:20 | rem(...) | exprs.kt:4:1:139:1 | topLevelMethod | MethodAccess |
333+
| exprs.kt:104:14:104:20 | ... % ... | exprs.kt:4:1:139:1 | topLevelMethod | RemExpr |
334334
| exprs.kt:104:19:104:20 | fy | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |
335335
| exprs.kt:105:5:105:21 | f6 | exprs.kt:4:1:139:1 | topLevelMethod | LocalVariableDeclExpr |
336336
| exprs.kt:105:14:105:15 | fx | exprs.kt:4:1:139:1 | topLevelMethod | VarAccess |

0 commit comments

Comments
 (0)