diff --git a/ql/src/codeql_ruby/ast/Expr.qll b/ql/src/codeql_ruby/ast/Expr.qll index 1b0c3e17306..ef38e6d18c3 100644 --- a/ql/src/codeql_ruby/ast/Expr.qll +++ b/ql/src/codeql_ruby/ast/Expr.qll @@ -165,10 +165,10 @@ class BodyStatement extends StmtSequence { override BodyStatement::Range range; /** Gets the `n`th rescue clause in this block. */ - final RescueExpr getRescue(int n) { result = range.getRescue(n) } + final RescueClause getRescue(int n) { result = range.getRescue(n) } /** Gets a rescue clause in this block. */ - final RescueExpr getARescue() { result = this.getRescue(_) } + final RescueClause getARescue() { result = this.getRescue(_) } /** Gets the `else` clause in this block, if any. */ final StmtSequence getElse() { result = range.getElse() } @@ -247,10 +247,10 @@ class Pair extends Expr, @pair { * puts msg * end */ -class RescueExpr extends Expr, @rescue { - final override RescueExpr::Range range; +class RescueClause extends Expr, @rescue { + final override RescueClause::Range range; - final override string getAPrimaryQlClass() { result = "RescueExpr" } + final override string getAPrimaryQlClass() { result = "RescueClause" } /** * Gets the `n`th exception to match, if any. For example `FirstError` or `SecondError` in: diff --git a/ql/src/codeql_ruby/ast/internal/Expr.qll b/ql/src/codeql_ruby/ast/internal/Expr.qll index 9c966d61896..c395511e43f 100644 --- a/ql/src/codeql_ruby/ast/internal/Expr.qll +++ b/ql/src/codeql_ruby/ast/internal/Expr.qll @@ -234,7 +234,7 @@ module BodyStatement { ) } - final RescueExpr getRescue(int n) { + final RescueClause getRescue(int n) { result = rank[n + 1](Generated::Rescue node, int i | node = getChild(i) | node order by i) } @@ -306,7 +306,7 @@ module Ensure { } } -module RescueExpr { +module RescueClause { class Range extends Expr::Range, @rescue { final override Generated::Rescue generated;