hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-20 08:53:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

CFG: improve handling of block and lambda

Browse Source
This commit is contained in:
Arthur Baars
2020-12-15 19:01:29 +01:00
parent 30895e634c
commit f2effce786
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll
View File

@@ -73,10 +73,26 @@ private module CfgScope {
private class BlockScope extends Range, Generated::Block {
final override string getName() { result = "block" }
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::BlockTree).getFirstChildNode(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
last(this.(Trees::BlockTree).getLastChildNode(), last, c)
}
}
private class LambdaScope extends Range, Generated::Lambda {
final override string getName() { result = "lambda" }
final override predicate entry(Generated::AstNode first) {
first(this.(Trees::LambdaTree).getFirstChildNode(), first)
}
final override predicate exit(Generated::AstNode last, Completion c) {
last(this.(Trees::LambdaTree).getLastChildNode(), last, c)
}
}
}

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

@@ -295,7 +295,7 @@ module Trees {
}
}
private class BlockTree extends StandardPreOrderTree, Block {
class BlockTree extends StandardNode, PreOrderTree, PostOrderTree, Block {
final override AstNode getChildNode(int i) {
result = this.getParameters() and i = 0
or
@@ -439,7 +439,9 @@ module Trees {
override predicate isHidden() { any() }
}
private class DoBlockTree extends RescueEnsureBlockTree, PreOrderTree, PostOrderTree, DoBlock {
private class DoBlockTree extends RescueEnsureBlockTree, PostOrderTree, DoBlock {
final override predicate first(AstNode first) { first = this }
final override AstNode getChildNode(int i, boolean rescuable) {
result = this.getParameters() and i = 0 and rescuable = false
or
@@ -687,7 +689,7 @@ module Trees {
final override AstNode getDefaultValue() { result = this.getValue() }
}
private class LambdaTree extends StandardPreOrderTree, Lambda {
class LambdaTree extends StandardNode, PreOrderTree, PostOrderTree, Lambda {
final override AstNode getChildNode(int i) {
result = this.getParameters() and i = 0
or