hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 18:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added ability to parse nested character classes while using v flag.

Browse Source
This commit is contained in:
Napalys
2025-03-02 17:14:08 +01:00
parent de6f3b1d04
commit 2333c538d9
2 changed files with 114 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
javascript/extractor/src/com/semmle/js/parser/RegExpParser.java
View File

@@ -545,6 +545,7 @@ public class RegExpParser {
}
private RegExpTerm parseCharacterClass() {
if (flags != null && flags.contains("v")) return parseNestedCharacterClass();
SourceLocation loc = new SourceLocation(pos());
List<RegExpTerm> elements = new ArrayList<>();
@@ -560,6 +561,28 @@ public class RegExpParser {
return this.finishTerm(new CharacterClass(loc, elements, inverted));
}
// ECMA 2024 `v` flag allows nested character classes.
private RegExpTerm parseNestedCharacterClass() {
SourceLocation loc = new SourceLocation(pos());
List<RegExpTerm> elements = new ArrayList<>();
this.match("[");
boolean inverted = this.match("^");
while (!this.match("]")) {
if (this.atEOS()) {
this.error(Error.EXPECTED_RBRACKET);
break;
}
if (lookahead("[")) {
elements.add(parseNestedCharacterClass());
}
else {
elements.add(this.parseCharacterClassElement());
}
}
return this.finishTerm(new CharacterClass(loc, elements, inverted));
}
private static final List<String> escapeClasses = Arrays.asList("d", "D", "s", "S", "w", "W");
private RegExpTerm parseCharacterClassElement() {