mirror of
https://github.com/github/codeql.git
synced 2026-05-04 21:25:44 +02:00
use namespace in PrintAst.qll to avoid conflict with Top
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
import java
|
||||
import semmle.code.java.regex.RegexTreeView
|
||||
import semmle.code.java.regex.RegexTreeView as RegexTreeView
|
||||
|
||||
private newtype TPrintAstConfiguration = MkPrintAstConfiguration()
|
||||
|
||||
@@ -134,8 +134,10 @@ private newtype TPrintAstNode =
|
||||
TImportsNode(CompilationUnit cu) {
|
||||
shouldPrint(cu, _) and exists(Import i | i.getCompilationUnit() = cu)
|
||||
} or
|
||||
TRegExpTermNode(RegExpTerm term) {
|
||||
exists(StringLiteral str | term.getRootTerm() = getParsedRegExp(str) and shouldPrint(str, _))
|
||||
TRegExpTermNode(RegexTreeView::RegExpTerm term) {
|
||||
exists(StringLiteral str |
|
||||
term.getRootTerm() = RegexTreeView::getParsedRegExp(str) and shouldPrint(str, _)
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -316,7 +318,7 @@ final class StringLiteralNode extends ExprStmtNode {
|
||||
|
||||
override PrintAstNode getChild(int childIndex) {
|
||||
childIndex = 0 and
|
||||
result.(RegExpTermNode).getTerm() = getParsedRegExp(element)
|
||||
result.(RegExpTermNode).getTerm() = RegexTreeView::getParsedRegExp(element)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -324,12 +326,12 @@ final class StringLiteralNode extends ExprStmtNode {
|
||||
* A node representing a regular expression term.
|
||||
*/
|
||||
class RegExpTermNode extends TRegExpTermNode, PrintAstNode {
|
||||
RegExpTerm term;
|
||||
RegexTreeView::RegExpTerm term;
|
||||
|
||||
RegExpTermNode() { this = TRegExpTermNode(term) }
|
||||
|
||||
/** Gets the `RegExpTerm` for this node. */
|
||||
RegExpTerm getTerm() { result = term }
|
||||
RegexTreeView::RegExpTerm getTerm() { result = term }
|
||||
|
||||
override PrintAstNode getChild(int childIndex) {
|
||||
result.(RegExpTermNode).getTerm() = term.getChild(childIndex)
|
||||
|
||||
Reference in New Issue
Block a user