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

Make EndBlockTree extend StmtSequenceTree

Browse Source
This commit is contained in:
Nick Rolfe
2021-05-17 14:57:32 +01:00
parent 6d395230d4
commit 9a2523e2f9
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
View File

@@ -57,11 +57,11 @@ module CfgScope {
private class EndBlockScope extends Range_, EndBlock {
final override predicate entry(AstNode first) {
first(this.(Trees::EndBlockTree).getFirstChildNode(), first)
first(this.(Trees::EndBlockTree).getBodyChild(0, _), first)
}
final override predicate exit(AstNode last, Completion c) {
last(this.(Trees::EndBlockTree).getLastChildNode(), last, c)
last(this.(Trees::EndBlockTree).getLastBodyChild(), last, c)
}
}
@@ -738,8 +738,17 @@ module Trees {
private class EmptyStatementTree extends LeafTree, EmptyStmt { }
class EndBlockTree extends ScopeTree, EndBlock {
final override ControlFlowTree getChildNode(int i) { result = this.getStmt(i) }
class EndBlockTree extends StmtSequenceTree, EndBlock {
override predicate first(AstNode first) { first = this }
override predicate succ(AstNode pred, AstNode succ, Completion c) {
// Normal left-to-right evaluation in the body
exists(int i |
last(this.getBodyChild(i, _), pred, c) and
first(this.getBodyChild(i + 1, _), succ) and
c instanceof NormalCompletion
)
}
}
private class ForInTree extends LeafTree, ForIn { }
@@ -1153,8 +1162,6 @@ module Trees {
private class SplatParameterTree extends NonDefaultValueParameterTree, SplatParameter { }
class StmtSequenceTree extends PostOrderTree, StmtSequence {
StmtSequenceTree() { not this instanceof EndBlock }
override predicate propagatesAbnormal(AstNode child) { child = this.getAStmt() }
override predicate first(AstNode first) { first(this.getStmt(0), first) }