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

Avoid 'Object::' prefixes

Browse Source
This commit is contained in:
Arthur Baars
2021-03-30 16:14:21 +02:00
parent b2c7185664
commit f12e6ea8ea
3 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ql/src/codeql_ruby/ast/internal/Module.qll
View File

@@ -51,6 +51,11 @@ ModuleBase enclosing(ModuleBase m, int level) {
result = enclosing(m.getOuterScope().getEnclosingModule(), level - 1)
}
bindingset[qualifier, name]
private string scopeAppend(string qualifier, string name) {
if qualifier = "Object" then result = name else result = qualifier + "::" + name
}
private string resolveRelativeToEnclosing(ConstantAccess n, int i) {
not isToplevel(n) and
not exists(n.getScopeExpr()) and
@@ -58,7 +63,7 @@ private string resolveRelativeToEnclosing(ConstantAccess n, int i) {
n = s.getADescendant() and
enclosing = enclosing(s.getEnclosingModule(), i) and
(
result = constantDefinition0(enclosing) + "::" + n.getName()
result = scopeAppend(constantDefinition0(enclosing), n.getName())
or
enclosing instanceof Toplevel and result = n.getName()
)
@@ -71,13 +76,13 @@ private string qualifiedNameForConstant0(ConstantAccess n) {
or
result = resolveRelativeToEnclosing(n, 0)
or
result = resolveScopeExpr0(n.getScopeExpr()) + "::" + n.getName()
result = scopeAppend(resolveScopeExpr0(n.getScopeExpr()), n.getName())
}
string constantDefinition(ConstantWriteAccess n) {
result = constantDefinition0(n)
or
result = resolveScopeExpr(n.getScopeExpr()) + "::" + n.getName()
result = scopeAppend(resolveScopeExpr(n.getScopeExpr()), n.getName())
}
private string resolveScopeExpr(ConstantReadAccess n) {