Skip to content

Commit 2b060b1

Browse files
d10cd10c
committed
Swift: initial schema change (generated part)
1 parent 0c55561 commit 2b060b1

18 files changed

+109
-67
lines changed

‎swift/ql/.generated.list

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ ql/lib/codeql/swift/elements/expr/ConditionalBridgeFromObjCExprConstructor.qll 7
9797
ql/lib/codeql/swift/elements/expr/ConditionalCheckedCastExpr.qll 527f8f1dd071e2647f6f86a6b204a082c7e9929f9a37f35b8dcd40e99e1064b2 a66a1e07b210a1e8d999380db04a8b3210b66049a876bd92c8f56eae66c5a062
9898
ql/lib/codeql/swift/elements/expr/ConditionalCheckedCastExprConstructor.qll 13a1032bfa1199245746d4aac2c54d3ba336d3580c2713a66a91ad47eb8648ca 2a7c66669551aaa3528d77a8525985b850acbc983fea6f076561709a076dadb7
9999
ql/lib/codeql/swift/elements/expr/ConstructorRefCallExpr.qll e8830d2c73a10d394495b8aa5bc68290f9524b0f09dba932d7cd7b533f149a1b fc4b855b27f7afefab8132bd2adc3567cceec6b2fd762bf1dc7463ce76421326
100-
ql/lib/codeql/swift/elements/expr/ConstructorRefCallExprConstructor.qll 7f22cf621c69a4cd11f40332d8f0bce9381f87830d600f5fa5aae6df9a0bcace 7005c9c220532188b338b99c87f6fd8c9975f7af0fee16812a2faf69a9660ac0
101100
ql/lib/codeql/swift/elements/expr/CovariantFunctionConversionExpr.qll 687065e8625a249d51e8e92136afacfd3c48f85f689d5aff077a5a9dac56272e 4510d77d211f4b6db9dd4c941706d7eb7579fe7311714758c9d1d24513bfbdc4
102101
ql/lib/codeql/swift/elements/expr/CovariantFunctionConversionExprConstructor.qll eac12524819e9fe29074f90ea89fea866023b5ed4a5494345f2b9d8eec531620 71a6eb320630f42403e1e67bb37c39a1bae1c9f6cc38c0f1688a31f3f206d83f
103102
ql/lib/codeql/swift/elements/expr/CovariantReturnConversionExpr.qll e6a7a3ce538c068bd7ab0974b4615acbf00038d3b01dc594372152114559fa44 720fb172ebcb800c70810539c7a80dbdf61acb970277f2b6a54b9159ab4e016e
@@ -115,7 +114,6 @@ ql/lib/codeql/swift/elements/expr/DiscardAssignmentExprConstructor.qll cd814e77f
115114
ql/lib/codeql/swift/elements/expr/DotSelfExprConstructor.qll 4b6956818dac5b460dfbe9878c2c5b6761fcf1c65556b38555f68de9cc6f2562 2ae26f5e7bde2f972cc5a63e4a3dca1698e3a7c75b06419bb7bb080cb8ce78d9
116115
ql/lib/codeql/swift/elements/expr/DotSyntaxBaseIgnoredExprConstructor.qll 8ca889cc506cac0eeb35c246a3f317c9da8fe4dbfaf736a2056108b00b1c8521 9a20b12ad44f1dbf58d205a58cdfc1d63d2540353d8c8df48d87393d3b50d8b6
117116
ql/lib/codeql/swift/elements/expr/DotSyntaxCallExpr.qll f5048cff6fcdd298c8822ece1cd2042a61b40521dfc230f0f0e1798527010e58 5220861621d01b15ea0182bbb8358d700f842b94ec07745f77c5285d0e84a509
118-
ql/lib/codeql/swift/elements/expr/DotSyntaxCallExprConstructor.qll d32660cba3474b84e060eb33bbf57d77722ce7bf2a320aec15ccd980e0a0d0bb 0a6f46f887750221f01e7f5d834b7c811009e4351c1afc0b4ef61ac6c0af421b
119117
ql/lib/codeql/swift/elements/expr/DynamicLookupExpr.qll cd5670379df14b7a765037378221e541dd93567c97729d6be24bbbbb9aacc054 89f564a793d1f09a8aeb2dd61c475df3e55a49f4f0b6094ceb9f0ebe6d42fa76
120118
ql/lib/codeql/swift/elements/expr/DynamicMemberRefExprConstructor.qll 6bd769bdbb83999bfd94bf4d5a1b8a32cc045460183f5f2fcf7055257f6c3787 e2b72550a71f2f39bde171ada6e04c6bdbd797caa74813ea3c8070b93cefa25e
121119
ql/lib/codeql/swift/elements/expr/DynamicSubscriptExprConstructor.qll d40d88069371807c72445453f26e0777ac857e200c9c3e8a88cd55628ccb9230 6ff580bbc1b7f99c95145168f7099ab19b5d150e7d7e83747595ff2eb2c289c4
@@ -365,7 +363,7 @@ ql/lib/codeql/swift/elements/type/VariadicSequenceType.qll 5bca77dd661d3b2653d31
365363
ql/lib/codeql/swift/elements/type/VariadicSequenceTypeConstructor.qll 0d1d2328a3b5e503a883e7e6d7efd0ca5e7f2633abead9e4c94a9f98ed3cb223 69bff81c1b9413949eacb9298d2efb718ea808e68364569a1090c9878c4af856
366364
ql/lib/codeql/swift/elements/type/WeakStorageType.qll 87a28616eea3600fb0156fffcd65eeddc1ea74ce9c0ba5886c6365b9359e00ce 9c968414d7cc8d672f3754bced5d4f83f43a6d7872d0d263d79ff60483e1f996
367365
ql/lib/codeql/swift/elements/type/WeakStorageTypeConstructor.qll d88b031ef44d6de14b3ddcff2eb47b53dbd11550c37250ff2edb42e5d21ec3e9 26d855c33492cf7a118e439f7baeed0e5425cfaf058b1dcc007eca7ed765c897
368-
ql/lib/codeql/swift/elements.qll 954945d6d4939b28e024b85f77c58ab5b4fab2c931aa5650e22d8ded97a7eda9 954945d6d4939b28e024b85f77c58ab5b4fab2c931aa5650e22d8ded97a7eda9
366+
ql/lib/codeql/swift/elements.qll 56ea4825f91bb761355f366b0b57ea49cd3df513abf901b370445b0f9264845d 56ea4825f91bb761355f366b0b57ea49cd3df513abf901b370445b0f9264845d
369367
ql/lib/codeql/swift/generated/AstNode.qll 02ca56d82801f942ae6265c6079d92ccafdf6b532f6bcebd98a04029ddf696e4 6216fda240e45bd4302fa0cf0f08f5f945418b144659264cdda84622b0420aa2
370368
ql/lib/codeql/swift/generated/Callable.qll f67df00043a3d7100d1438a5bc9cda18390db89d05047c47650b85ac4eaf3cb5 aab5400c5e31d9175a60c62483609aa7b11bb1dbdb652cba59025d077996c322
371369
ql/lib/codeql/swift/generated/Comment.qll f58b49f6e68c21f87c51e2ff84c8a64b09286d733e86f70d67d3a98fe6260bd6 975bbb599a2a7adc35179f6ae06d9cbc56ea8a03b972ef2ee87604834bc6deb1
@@ -377,11 +375,11 @@ ql/lib/codeql/swift/generated/ErrorElement.qll 4b032abe8ffb71376a29c63e470a52943
377375
ql/lib/codeql/swift/generated/File.qll 61454459f5f1ae378bd4970ad1da4f39f3e696bac8a5eebdd162f131995c5316 3e6805f8858cd55dd0e0d0e5aeab923d6a55292dbf98b0029db1ae0208efe684
378376
ql/lib/codeql/swift/generated/Locatable.qll bdc98b9fb7788f44a4bf7e487ee5bd329473409950a8e9f116d61995615ad849 0b36b4fe45e2aa195e4bb70c50ea95f32f141b8e01e5f23466c6427dd9ab88fb
379377
ql/lib/codeql/swift/generated/Location.qll 851766e474cdfdfa67da42e0031fc42dd60196ff5edd39d82f08d3e32deb84c1 b29b2c37672f5acff15f1d3c5727d902f193e51122327b31bd27ec5f877bca3b
380-
ql/lib/codeql/swift/generated/ParentChild.qll 0667eb3c260b97beefd4934c80f7ffd2350488807effb3fd79bf187d179cd9bb dc0d237357baa46fae3e453d0446646c6a444155f08a9811aa29167c8cd34c73
381-
ql/lib/codeql/swift/generated/PureSynthConstructors.qll 1cd47d61fec37e019ce2e476603eb2273775bea81062d6bf3d6bbc49796f7b77 1cd47d61fec37e019ce2e476603eb2273775bea81062d6bf3d6bbc49796f7b77
378+
ql/lib/codeql/swift/generated/ParentChild.qll 37af8347ae69f840f37c13b532440a17b871d381130ac86b2c61667026712eea 5989b6d3ef54b5977185cc988e6cab4b796485d8cbe089c8714bcebfbdb11f3a
379+
ql/lib/codeql/swift/generated/PureSynthConstructors.qll 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98
382380
ql/lib/codeql/swift/generated/Raw.qll 6b8e3e3d86254d5689b17a08c41d23cda0d913b5d3b22b18b55aa00363ace6df 3736f05fc2c2eb6a9d9dd0d244061abe72161714cd435233106804472213e2b1
383-
ql/lib/codeql/swift/generated/Synth.qll cc7285c43e6c9f47ab67047916d232ad2078443b342ba1bb036c147127c40167 522a3ba4fc7f9fbb0b7d12fc5177fa0a0d2f8239bd6b4c36fc7d7a918fcdcccf
384-
ql/lib/codeql/swift/generated/SynthConstructors.qll 0ff9cfcd64e7701003091f366ec903ec1bf82ec8385ee683b6e7b4e189033b11 0ff9cfcd64e7701003091f366ec903ec1bf82ec8385ee683b6e7b4e189033b11
381+
ql/lib/codeql/swift/generated/Synth.qll 6a9e6edcc43732b6cf947d88b9562a591a54c651aa8e4f94b8b6139ff3f84b63 a1f37bb361fed57104f8277c8f8b1962a0a54b1f80c2d676e71c40a91d3af529
382+
ql/lib/codeql/swift/generated/SynthConstructors.qll 62360813f1419e111732e42e209535a40644997009890d09e4cc70f3918fbf86 62360813f1419e111732e42e209535a40644997009890d09e4cc70f3918fbf86
385383
ql/lib/codeql/swift/generated/UnknownFile.qll 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6
386384
ql/lib/codeql/swift/generated/UnknownLocation.qll e50efefa02a0ec1ff635a00951b5924602fc8cab57e5756e4a039382c69d3882 e50efefa02a0ec1ff635a00951b5924602fc8cab57e5756e4a039382c69d3882
387385
ql/lib/codeql/swift/generated/UnspecifiedElement.qll dbc6ca4018012977b26ca184a88044c55b0661e3998cd14d46295b62a8d69625 184c9a0ce18c2ac881943b0fb400613d1401ed1d5564f90716b6c310ba5afe71
@@ -509,7 +507,7 @@ ql/lib/codeql/swift/generated/expr/MagicIdentifierLiteralExpr.qll 16f0050128caf9
509507
ql/lib/codeql/swift/generated/expr/MakeTemporarilyEscapableExpr.qll d23bd9ea3b13869d7a7f7eef3c3d1c3c156d384b72c65867a0b955bc517da775 f2fd167ac40f01c092b2b443af1557c92dac32074506f2195d32f60b0e0547d8
510508
ql/lib/codeql/swift/generated/expr/MemberRefExpr.qll 0ece9ffbfd4b15722aa3870014a46afdbf1b1382972fb366d741fafb5473e3de fcb57bd65a94ed4214730339c4ed2b167ec22a3dc9017399596f9b26bdeb95cd
511509
ql/lib/codeql/swift/generated/expr/MetatypeConversionExpr.qll 714ecbc8ac51fdaaa4075388f20fe5063ead9264ca20c4ab8864c48364ef4b42 714ecbc8ac51fdaaa4075388f20fe5063ead9264ca20c4ab8864c48364ef4b42
512-
ql/lib/codeql/swift/generated/expr/MethodRefExpr.qll 014f976ce55cfc07a18a86c379fcf12c68f3c300c2d5e730731e61bfa50c6419 014f976ce55cfc07a18a86c379fcf12c68f3c300c2d5e730731e61bfa50c6419
510+
ql/lib/codeql/swift/generated/expr/MethodLookupExpr.qll 321d45064facd2917fd99a181b1288ec3cec09cf2b8f548d517423228351f414 321d45064facd2917fd99a181b1288ec3cec09cf2b8f548d517423228351f414
513511
ql/lib/codeql/swift/generated/expr/NilLiteralExpr.qll 6f44106bc5396c87681676fc3e1239fe052d1a481d0a854afa8b66369668b058 6f44106bc5396c87681676fc3e1239fe052d1a481d0a854afa8b66369668b058
514512
ql/lib/codeql/swift/generated/expr/NumberLiteralExpr.qll 8acc7df8fe83b7d36d66b2feed0b8859bfde873c6a88dd676c9ebed32f39bd04 4bbafc8996b2e95522d8167417668b536b2651817f732554de3083c4857af96a
515513
ql/lib/codeql/swift/generated/expr/ObjCSelectorExpr.qll 8b4f7a9668d1cae4058ba460673b3e0b79f05f2fe871fd992ca1b7ea85f7c09d 629a3057c0ff3ede3a18ea8ea1aa29b24bc780d0dc60b51f99793a6001432a4e
@@ -775,9 +773,9 @@ ql/test/extractor-tests/generated/expr/LazyInitializerExpr/MISSING_SOURCE.txt 7e
775773
ql/test/extractor-tests/generated/expr/MagicIdentifierLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
776774
ql/test/extractor-tests/generated/expr/MakeTemporarilyEscapableExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
777775
ql/test/extractor-tests/generated/expr/MemberRefExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
778-
ql/test/extractor-tests/generated/expr/MethodRefExpr/MethodRefExpr.ql 53b3a01d27336f55ce24eb278b5fb54a00fdacd24fd04e0267541de7fc282009 8d8f42acc84d02166648a6c9857bf988abaff967f130d100b25aae114b99ade0
779-
ql/test/extractor-tests/generated/expr/MethodRefExpr/MethodRefExpr_getMember.ql 178794928d040a4a5ebbae0cd835936eac0214756fbb5b4bbbe29d4487e86d0c 6efedf486a073a487a45539f097219bb7ac9c11c0ce8d539e950a9e5035d8a61
780-
ql/test/extractor-tests/generated/expr/MethodRefExpr/MethodRefExpr_getType.ql 991f8855bd8297971aec205aa13d072674739133d4adb8cdaa272c6340848bb4 08810d4640f61ab4ede0ddb0d23c498936ae3b6ee3f40ab7f702b96ad5dba101
776+
ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql 70598fab2dd87c26fedc9100d73aef9d8b4f60172a2b34c0fd943ab6cf374aa7 83dccc366bd761c01b27ce7e8f52be47743eb45462158997536643d236472d83
777+
ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getMember.ql 859ce0b1f54980e6383ff87d7970eb8a7886d9e1fbe12a8a0a35d216850c6775 24faafdb4a88b0019073c06a1cda8e037154b232a364aa47ae151e95df8a868a
778+
ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getType.ql 3e749535dbf7ae2cd671b3e35b43ca4f6a5bc68c92f89a09a0a9193cd3200b9a 176102d8d9d5a7bf14ac654d98556048996f2311be0bfe67d16229fd22362ba7
781779
ql/test/extractor-tests/generated/expr/NilLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
782780
ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql 6c6b146537773b4b4bdb0e530bd581f4d9ffee93e784a8fdfcabe35309bdd09e 47b2a275af169a031faee39e73c67a70ec47969b731f1cc80a8f76e68d934402
783781
ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr_getArgument.ql ab308c1fa027136070a6ee9ebe5149c69b34bb9ae910f201f37cecd8b6341ff8 deef69f4a1a94386a32ec964e696972a2c6a91c34d7e99c7e4a3811980f5ecc4

‎swift/ql/lib/codeql/swift/elements.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ import codeql.swift.elements.expr.MagicIdentifierLiteralExpr
137137
import codeql.swift.elements.expr.MakeTemporarilyEscapableExpr
138138
import codeql.swift.elements.expr.MemberRefExpr
139139
import codeql.swift.elements.expr.MetatypeConversionExpr
140-
import codeql.swift.elements.expr.MethodRefExpr
140+
import codeql.swift.elements.expr.MethodLookupExpr
141141
import codeql.swift.elements.expr.NilLiteralExpr
142142
import codeql.swift.elements.expr.NumberLiteralExpr
143143
import codeql.swift.elements.expr.ObjCSelectorExpr

‎swift/ql/lib/codeql/swift/elements/expr/MethodRefExprConstructor.qll

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎swift/ql/lib/codeql/swift/generated/ParentChild.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,8 +2566,8 @@ private module Impl {
25662566
)
25672567
}
25682568

2569-
private Element getImmediateChildOfMethodRefExpr(
2570-
MethodRefExpr e, int index, string partialPredicateCall
2569+
private Element getImmediateChildOfMethodLookupExpr(
2570+
MethodLookupExpr e, int index, string partialPredicateCall
25712571
) {
25722572
exists(int b, int bLookupExpr, int n |
25732573
b = 0 and
@@ -4978,7 +4978,7 @@ private module Impl {
49784978
or
49794979
result = getImmediateChildOfMetatypeConversionExpr(e, index, partialAccessor)
49804980
or
4981-
result = getImmediateChildOfMethodRefExpr(e, index, partialAccessor)
4981+
result = getImmediateChildOfMethodLookupExpr(e, index, partialAccessor)
49824982
or
49834983
result = getImmediateChildOfNilLiteralExpr(e, index, partialAccessor)
49844984
or

‎swift/ql/lib/codeql/swift/generated/PureSynthConstructors.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// generated by codegen/codegen.py
2-
import codeql.swift.elements.expr.MethodRefExprConstructor
2+
import codeql.swift.elements.expr.MethodLookupExprConstructor

‎swift/ql/lib/codeql/swift/generated/Synth.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ module Synth {
144144
} or
145145
TMemberRefExpr(Raw::MemberRefExpr id) { constructMemberRefExpr(id) } or
146146
TMetatypeConversionExpr(Raw::MetatypeConversionExpr id) { constructMetatypeConversionExpr(id) } or
147-
TMethodRefExpr(Raw::DotSyntaxCallExpr id) { constructMethodRefExpr(id) } or
147+
TMethodLookupExpr(Raw::SelfApplyExpr id) { constructMethodLookupExpr(id) } or
148148
TNilLiteralExpr(Raw::NilLiteralExpr id) { constructNilLiteralExpr(id) } or
149149
TObjCSelectorExpr(Raw::ObjCSelectorExpr id) { constructObjCSelectorExpr(id) } or
150150
TObjectLiteralExpr(Raw::ObjectLiteralExpr id) { constructObjectLiteralExpr(id) } or
@@ -404,7 +404,7 @@ module Synth {
404404
TBuiltinLiteralExpr or TInterpolatedStringLiteralExpr or TNilLiteralExpr or
405405
TObjectLiteralExpr or TRegexLiteralExpr;
406406

407-
class TLookupExpr = TDynamicLookupExpr or TMemberRefExpr or TMethodRefExpr or TSubscriptExpr;
407+
class TLookupExpr = TDynamicLookupExpr or TMemberRefExpr or TMethodLookupExpr or TSubscriptExpr;
408408

409409
class TNumberLiteralExpr = TFloatLiteralExpr or TIntegerLiteralExpr;
410410

@@ -885,7 +885,7 @@ module Synth {
885885
}
886886

887887
cached
888-
TMethodRefExpr convertMethodRefExprFromRaw(Raw::Element e) { result = TMethodRefExpr(e) }
888+
TMethodLookupExpr convertMethodLookupExprFromRaw(Raw::Element e) { result = TMethodLookupExpr(e) }
889889

890890
cached
891891
TNilLiteralExpr convertNilLiteralExprFromRaw(Raw::Element e) { result = TNilLiteralExpr(e) }
@@ -1841,7 +1841,7 @@ module Synth {
18411841
or
18421842
result = convertMemberRefExprFromRaw(e)
18431843
or
1844-
result = convertMethodRefExprFromRaw(e)
1844+
result = convertMethodLookupExprFromRaw(e)
18451845
or
18461846
result = convertSubscriptExprFromRaw(e)
18471847
}
@@ -2523,7 +2523,7 @@ module Synth {
25232523
}
25242524

25252525
cached
2526-
Raw::Element convertMethodRefExprToRaw(TMethodRefExpr e) { e = TMethodRefExpr(result) }
2526+
Raw::Element convertMethodLookupExprToRaw(TMethodLookupExpr e) { e = TMethodLookupExpr(result) }
25272527

25282528
cached
25292529
Raw::Element convertNilLiteralExprToRaw(TNilLiteralExpr e) { e = TNilLiteralExpr(result) }
@@ -3479,7 +3479,7 @@ module Synth {
34793479
or
34803480
result = convertMemberRefExprToRaw(e)
34813481
or
3482-
result = convertMethodRefExprToRaw(e)
3482+
result = convertMethodLookupExprToRaw(e)
34833483
or
34843484
result = convertSubscriptExprToRaw(e)
34853485
}

‎swift/ql/lib/codeql/swift/generated/SynthConstructors.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ import codeql.swift.elements.expr.MagicIdentifierLiteralExprConstructor
102102
import codeql.swift.elements.expr.MakeTemporarilyEscapableExprConstructor
103103
import codeql.swift.elements.expr.MemberRefExprConstructor
104104
import codeql.swift.elements.expr.MetatypeConversionExprConstructor
105-
import codeql.swift.elements.expr.MethodRefExprConstructor
105+
import codeql.swift.elements.expr.MethodLookupExprConstructor
106106
import codeql.swift.elements.expr.NilLiteralExprConstructor
107107
import codeql.swift.elements.expr.ObjCSelectorExprConstructor
108108
import codeql.swift.elements.expr.ObjectLiteralExprConstructor

‎swift/ql/lib/codeql/swift/generated/expr/MethodRefExpr.qll renamed to ‎swift/ql/lib/codeql/swift/generated/expr/MethodLookupExpr.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ private import codeql.swift.generated.Raw
44
import codeql.swift.elements.expr.LookupExpr
55

66
module Generated {
7-
class MethodRefExpr extends Synth::TMethodRefExpr, LookupExpr {
8-
override string getAPrimaryQlClass() { result = "MethodRefExpr" }
7+
class MethodLookupExpr extends Synth::TMethodLookupExpr, LookupExpr {
8+
override string getAPrimaryQlClass() { result = "MethodLookupExpr" }
99
}
1010
}

‎swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
| file://:0:0:0:0 | .init(_:) | getBase: | file://:0:0:0:0 | UnownedSerialExecutor.Type |
2+
| method_lookups.swift:7:13:7:13 | (no string representation) | getBase: | method_lookups.swift:7:13:7:13 | self |
3+
| method_lookups.swift:7:13:7:13 | .baz(_:) | getBase: | file://:0:0:0:0 | self |
4+
| method_lookups.swift:16:13:16:13 | (no string representation) | getBase: | method_lookups.swift:16:13:16:13 | self |
5+
| method_lookups.swift:16:13:16:13 | .baz(_:) | getBase: | file://:0:0:0:0 | self |
6+
| method_lookups.swift:27:13:27:13 | (no string representation) | getBase: | method_lookups.swift:27:13:27:13 | self |
7+
| method_lookups.swift:27:13:27:13 | .baz(_:) | getBase: | file://:0:0:0:0 | self |
8+
| method_lookups.swift:32:3:32:5 | .foo(_:_:) | getBase: | method_lookups.swift:32:3:32:3 | X.Type |
9+
| method_lookups.swift:33:3:33:5 | .bar() | getBase: | method_lookups.swift:33:3:33:3 | X.Type |
10+
| method_lookups.swift:34:3:34:3 | .init() | getBase: | method_lookups.swift:34:3:34:3 | X.Type |
11+
| method_lookups.swift:34:3:34:7 | .baz(_:) | getBase: | method_lookups.swift:34:3:34:5 | call to init() |
12+
| method_lookups.swift:36:11:36:13 | (no string representation) | getBase: | method_lookups.swift:36:11:36:11 | X.Type |
13+
| method_lookups.swift:36:13:36:13 | .bar() | getBase: | file://:0:0:0:0 | self |
14+
| method_lookups.swift:37:11:37:11 | .init() | getBase: | method_lookups.swift:37:11:37:11 | X.Type |
15+
| method_lookups.swift:37:11:37:15 | (no string representation) | getBase: | method_lookups.swift:37:11:37:13 | call to init() |
16+
| method_lookups.swift:37:15:37:15 | .baz(_:) | getBase: | file://:0:0:0:0 | self |
17+
| method_lookups.swift:40:1:40:1 | .init(priority:operation:) | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type |
18+
| method_lookups.swift:41:3:41:5 | .foo(_:_:) | getBase: | method_lookups.swift:41:3:41:3 | Y.Type |
19+
| method_lookups.swift:42:9:42:9 | .init() | getBase: | method_lookups.swift:42:9:42:9 | Y.Type |
20+
| method_lookups.swift:42:9:42:13 | .baz(_:) | getBase: | method_lookups.swift:42:9:42:11 | call to init() |
21+
| method_lookups.swift:44:11:44:13 | (no string representation) | getBase: | method_lookups.swift:44:11:44:11 | Y.Type |
22+
| method_lookups.swift:44:13:44:13 | .foo(_:_:) | getBase: | file://:0:0:0:0 | self |
23+
| method_lookups.swift:47:1:47:1 | .init(priority:operation:) | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type |
24+
| method_lookups.swift:48:9:48:11 | (no string representation) | getBase: | method_lookups.swift:48:9:48:9 | Z.Type |
25+
| method_lookups.swift:49:9:49:11 | (no string representation) | getBase: | method_lookups.swift:49:9:49:9 | Z.Type |
26+
| method_lookups.swift:50:9:50:9 | (no string representation) | getBase: | method_lookups.swift:50:9:50:9 | Z.Type |
27+
| method_lookups.swift:50:9:50:13 | (no string representation) | getBase: | method_lookups.swift:50:9:50:11 | call to ... |
28+
| method_lookups.swift:52:11:52:13 | (no string representation) | getBase: | method_lookups.swift:52:11:52:11 | Z.Type |
29+
| method_lookups.swift:52:13:52:13 | .bar() | getBase: | file://:0:0:0:0 | self |
30+
| method_lookups.swift:53:11:53:23 | (no string representation) | getBase: | method_lookups.swift:53:18:53:20 | call to ... |
31+
| method_lookups.swift:53:18:53:18 | (no string representation) | getBase: | method_lookups.swift:53:18:53:18 | Z.Type |
32+
| method_lookups.swift:53:23:53:23 | .baz(_:) | getBase: | file://:0:0:0:0 | self |

‎swift/ql/test/extractor-tests/generated/expr/MethodRefExpr/MethodRefExpr.ql renamed to ‎swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import codeql.swift.elements
33
import TestUtils
44

5-
from MethodRefExpr x, string hasType, Expr getBase, string hasMember
5+
from MethodLookupExpr x, string hasType, Expr getBase, string hasMember
66
where
77
toBeTested(x) and
88
not x.isUnknown() and

0 commit comments

Comments
 (0)