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

Create NamespaceTree to reduce duplication

Browse Source
This commit is contained in:
Nick Rolfe
2021-05-13 17:52:20 +01:00
parent 5e6dddad3e
commit a46f45440a
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,21 +580,7 @@ module Trees {
private class CharacterTree extends LeafTree, CharacterLiteral { }
private class ClassDeclarationTree extends BodyStmtTree, ClassDeclaration {
final override predicate first(AstNode first) {
this.firstInner(first)
or
not exists(this.getAChild(_)) and
first = this
}
final override predicate succ(AstNode pred, AstNode succ, Completion c) {
BodyStmtTree.super.succ(pred, succ, c)
or
succ = this and
this.lastInner(pred, c)
}
private class ClassDeclarationTree extends NamespaceTree, ClassDeclaration {
/** Gets the `i`th child in the body of this block. */
final override AstNode getBodyChild(int i, boolean rescuable) {
result = this.getScopeExpr() and i = 0 and rescuable = false
@@ -603,8 +589,10 @@ module Trees {
i = count(this.getScopeExpr()) and
rescuable = true
or
result = this.getStmt(i - count(this.getScopeExpr()) - count(this.getSuperclassExpr())) and
rescuable = true
result =
NamespaceTree.super
.getBodyChild(i - count(this.getScopeExpr()) - count(this.getSuperclassExpr()),
rescuable)
}
}
@@ -934,7 +922,16 @@ module Trees {
}
}
private class ModuleDeclarationTree extends BodyStmtTree, ModuleDeclaration {
private class ModuleDeclarationTree extends NamespaceTree, ModuleDeclaration {
/** Gets the `i`th child in the body of this block. */
final override AstNode getBodyChild(int i, boolean rescuable) {
result = this.getScopeExpr() and i = 0 and rescuable = false
or
result = NamespaceTree.super.getBodyChild(i - count(this.getScopeExpr()), rescuable)
}
}
private class NamespaceTree extends BodyStmtTree, Namespace {
final override predicate first(AstNode first) {
this.firstInner(first)
or
@@ -948,13 +945,6 @@ module Trees {
succ = this and
this.lastInner(pred, c)
}
/** Gets the `i`th child in the body of this block. */
final override AstNode getBodyChild(int i, boolean rescuable) {
result = this.getScopeExpr() and i = 0 and rescuable = false
or
result = BodyStmtTree.super.getBodyChild(i - count(this.getScopeExpr()), rescuable)
}
}
private class NilTree extends LeafTree, NilLiteral { }