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

Create ComplexSymbolRange class to deduplicate some predicates

Browse Source
This commit is contained in:
Nick Rolfe
2021-01-22 14:21:39 +00:00
parent 3939008fd5
commit 243dfde72e
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ql/src/codeql_ruby/ast/internal/Expr.qll
View File

@@ -114,18 +114,18 @@ module SymbolLiteral {
final override string toString() { result = generated.getValue() }
}
class DelimitedSymbolRange extends SymbolLiteral::Range, @delimited_symbol {
final override Generated::DelimitedSymbol generated;
abstract private class ComplexSymbolRange extends SymbolLiteral::Range {
abstract Generated::AstNode getChild(int i);
final override string getValueText() {
strictcount(generated.getChild(_)) = 1 and
result = generated.getChild(0).(Generated::Token).getValue()
strictcount(this.getChild(_)) = 1 and
result = this.getChild(0).(Generated::Token).getValue()
}
private string summaryString() {
result =
concat(AstNode c, int i, string s |
c = generated.getChild(i) and
c = this.getChild(i) and
if c instanceof Generated::Token
then s = c.(Generated::Token).getValue()
else s = "#{...}"
@@ -141,31 +141,16 @@ module SymbolLiteral {
}
}
class BareSymbolRange extends SymbolLiteral::Range, @bare_symbol {
class DelimitedSymbolRange extends ComplexSymbolRange, @delimited_symbol {
final override Generated::DelimitedSymbol generated;
final override Generated::AstNode getChild(int i) { result = generated.getChild(i) }
}
class BareSymbolRange extends ComplexSymbolRange, @bare_symbol {
final override Generated::BareSymbol generated;
final override string getValueText() {
strictcount(generated.getChild(_)) = 1 and
result = generated.getChild(0).(Generated::Token).getValue()
}
private string summaryString() {
result =
concat(AstNode c, int i, string s |
c = generated.getChild(i) and
if c instanceof Generated::Token
then s = c.(Generated::Token).getValue()
else s = "#{...}"
|
s order by i
)
}
final override string toString() {
if summaryString().regexpMatch("[a-zA-z_][a-zA-Z_0-9]*")
then result = ":" + summaryString()
else result = ":\"" + summaryString() + "\""
}
final override Generated::AstNode getChild(int i) { result = generated.getChild(i) }
}
class HashKeySymbolRange extends SymbolLiteral::Range, @token_hash_key_symbol {