Skip to content

Commit aad5d13

Browse files
authored
Merge pull request #161 from github/hvitved/cfg-remove-is-hidden
CFG: Remove `isHidden()` predicate
2 parents 9472cef + 0bb5007 commit aad5d13

13 files changed

Lines changed: 686 additions & 353 deletions

File tree

ql/src/codeql_ruby/ast/Expr.qll

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ class ArgumentList extends Expr, TArgumentList {
5757
class StmtSequence extends Expr, TStmtSequence {
5858
override string getAPrimaryQlClass() { result = "StmtSequence" }
5959

60-
override string toString() {
61-
exists(int c | c = this.getNumberOfStatements() |
62-
c = 0 and result = ";"
63-
or
64-
c = 1 and result = this.getStmt(0).toString()
65-
or
66-
c > 1 and result = "...; ..."
67-
)
68-
}
69-
7060
/** Gets the `n`th statement in this sequence. */
7161
Stmt getStmt(int n) { none() }
7262

@@ -91,6 +81,8 @@ private class Then extends StmtSequence, TThen {
9181
Then() { this = TThen(g) }
9282

9383
override Stmt getStmt(int n) { toGenerated(result) = g.getChild(n) }
84+
85+
final override string toString() { result = "then ..." }
9486
}
9587

9688
private class Else extends StmtSequence, TElse {
@@ -99,6 +91,8 @@ private class Else extends StmtSequence, TElse {
9991
Else() { this = TElse(g) }
10092

10193
override Stmt getStmt(int n) { toGenerated(result) = g.getChild(n) }
94+
95+
final override string toString() { result = "else ..." }
10296
}
10397

10498
private class Do extends StmtSequence, TDo {
@@ -107,6 +101,8 @@ private class Do extends StmtSequence, TDo {
107101
Do() { this = TDo(g) }
108102

109103
override Stmt getStmt(int n) { toGenerated(result) = g.getChild(n) }
104+
105+
final override string toString() { result = "do ..." }
110106
}
111107

112108
private class Ensure extends StmtSequence, TEnsure {
@@ -212,13 +208,7 @@ class ParenthesizedExpr extends StmtSequence, TParenthesizedExpr {
212208

213209
final override string getAPrimaryQlClass() { result = "ParenthesizedExpr" }
214210

215-
final override string toString() {
216-
exists(int c | c = this.getNumberOfStatements() |
217-
c = 0 and result = "()"
218-
or
219-
c > 0 and result = "(" + StmtSequence.super.toString() + ")"
220-
)
221-
}
211+
final override string toString() { result = "( ... )" }
222212

223213
final override Stmt getStmt(int n) { toGenerated(result) = g.getChild(n) }
224214
}

0 commit comments

Comments
 (0)