Skip to content

Commit 513fe09

Browse files
committed
Treat class names in array/find/hash patterns as sub-patterns
1 parent d17c055 commit 513fe09

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

ruby/ql/lib/codeql/ruby/ast/internal/AST.qll

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ private module Cached {
246246
explicitAssignmentNode(g, _)
247247
or
248248
casePattern(g)
249-
or
250-
classReferencePattern(g)
251249
)
252250
} or
253251
TScopeResolutionMethodCall(Ruby::ScopeResolution g, Ruby::Identifier i) {
@@ -293,8 +291,6 @@ private module Cached {
293291
explicitAssignmentNode(g, _)
294292
or
295293
casePattern(g)
296-
or
297-
classReferencePattern(g)
298294
} or
299295
TTokenMethodName(MethodName::Token g) { MethodName::range(g) } or
300296
TTokenSuperCall(Ruby::Super g) { vcall(g) } or

ruby/ql/lib/codeql/ruby/ast/internal/Pattern.qll

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,7 @@ predicate casePattern(Ruby::AstNode node) {
4848
node = any(Ruby::KeywordPattern parent).getValue()
4949
or
5050
node = any(Ruby::ParenthesizedPattern parent).getChild()
51-
}
52-
53-
/**
54-
* Holds if `node` is a class reference used in an
55-
* array, find, or hash pattern.
56-
*/
57-
predicate classReferencePattern(Ruby::AstNode node) {
51+
or
5852
node = any(Ruby::ArrayPattern p).getClass()
5953
or
6054
node = any(Ruby::FindPattern p).getClass()

ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,6 @@ private predicate inMatchingContext(AstNode n) {
227227
or
228228
n instanceof CasePattern
229229
or
230-
n = any(ArrayPattern p).getClass()
231-
or
232-
n = any(FindPattern p).getClass()
233-
or
234-
n = any(HashPattern p).getClass()
235-
or
236230
n.(Trees::DefaultValueParameterTree).hasDefaultValue()
237231
}
238232

0 commit comments

Comments
 (0)