|
7 | 7 | */
|
8 | 8 |
|
9 | 9 | import java
|
10 |
| -import semmle.code.java.regex.RegexTreeView |
| 10 | +import semmle.code.java.regex.RegexTreeView as RegexTreeView |
11 | 11 |
|
12 | 12 | private newtype TPrintAstConfiguration = MkPrintAstConfiguration()
|
13 | 13 |
|
@@ -134,8 +134,10 @@ private newtype TPrintAstNode =
|
134 | 134 | TImportsNode(CompilationUnit cu) {
|
135 | 135 | shouldPrint(cu, _) and exists(Import i | i.getCompilationUnit() = cu)
|
136 | 136 | } or
|
137 |
| - TRegExpTermNode(RegExpTerm term) { |
138 |
| - exists(StringLiteral str | term.getRootTerm() = getParsedRegExp(str) and shouldPrint(str, _)) |
| 137 | + TRegExpTermNode(RegexTreeView::RegExpTerm term) { |
| 138 | + exists(StringLiteral str | |
| 139 | + term.getRootTerm() = RegexTreeView::getParsedRegExp(str) and shouldPrint(str, _) |
| 140 | + ) |
139 | 141 | }
|
140 | 142 |
|
141 | 143 | /**
|
@@ -316,20 +318,20 @@ final class StringLiteralNode extends ExprStmtNode {
|
316 | 318 |
|
317 | 319 | override PrintAstNode getChild(int childIndex) {
|
318 | 320 | childIndex = 0 and
|
319 |
| - result.(RegExpTermNode).getTerm() = getParsedRegExp(element) |
| 321 | + result.(RegExpTermNode).getTerm() = RegexTreeView::getParsedRegExp(element) |
320 | 322 | }
|
321 | 323 | }
|
322 | 324 |
|
323 | 325 | /**
|
324 | 326 | * A node representing a regular expression term.
|
325 | 327 | */
|
326 | 328 | class RegExpTermNode extends TRegExpTermNode, PrintAstNode {
|
327 |
| - RegExpTerm term; |
| 329 | + RegexTreeView::RegExpTerm term; |
328 | 330 |
|
329 | 331 | RegExpTermNode() { this = TRegExpTermNode(term) }
|
330 | 332 |
|
331 | 333 | /** Gets the `RegExpTerm` for this node. */
|
332 |
| - RegExpTerm getTerm() { result = term } |
| 334 | + RegexTreeView::RegExpTerm getTerm() { result = term } |
333 | 335 |
|
334 | 336 | override PrintAstNode getChild(int childIndex) {
|
335 | 337 | result.(RegExpTermNode).getTerm() = term.getChild(childIndex)
|
|
0 commit comments