From cf7ce911bccc4ed049216d07d80e57a24f5d69fc Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Fri, 19 Mar 2021 16:08:43 +0000 Subject: [PATCH] =?UTF-8?q?Combine=20CfgScope=20classes=20for=20BodyStmt?= =?UTF-8?q?=20=E2=88=A9=20Callable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/ControlFlowGraphImpl.qll | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll index bf1448acdc4..83091c2f87b 100644 --- a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll +++ b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll @@ -65,23 +65,7 @@ module CfgScope { } } - private class MethodScope extends Range_, Method { - final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) } - - final override predicate exit(AstNode last, Completion c) { - this.(Trees::BodyStmtTree).lastInner(last, c) - } - } - - private class SingletonMethodScope extends Range_, SingletonMethod { - final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) } - - final override predicate exit(AstNode last, Completion c) { - this.(Trees::BodyStmtTree).lastInner(last, c) - } - } - - private class DoBlockScope extends Range_, DoBlock { + private class BodyStmtCallableScope extends Range_, ASTInternal::TBodyStmt, Callable { final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) } final override predicate exit(AstNode last, Completion c) { @@ -98,14 +82,6 @@ module CfgScope { last(this.(Trees::BraceBlockTree).getLastChildNode(), last, c) } } - - private class LambdaScope extends Range_, Lambda { - final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) } - - final override predicate exit(AstNode last, Completion c) { - this.(Trees::BodyStmtTree).lastInner(last, c) - } - } } abstract private class ControlFlowTree extends AstNode {