diff --git a/cpp/ql/lib/semmle/code/cpp/regex/RegexTreeView.qll b/cpp/ql/lib/semmle/code/cpp/regex/RegexTreeView.qll index 1d961d3b977..85f26326d28 100644 --- a/cpp/ql/lib/semmle/code/cpp/regex/RegexTreeView.qll +++ b/cpp/ql/lib/semmle/code/cpp/regex/RegexTreeView.qll @@ -651,7 +651,7 @@ private module Impl implements RegexTreeViewSig { * ``` */ class RegExpCharacterClassEscape extends RegExpEscape { - RegExpCharacterClassEscape() { this.getValue() in ["d", "D", "s", "S", "w", "W", "h", "H"] } + RegExpCharacterClassEscape() { this.getValue() in ["d", "D", "s", "S", "w", "W"] } override RegExpTerm getChild(int i) { none() } diff --git a/cpp/ql/test/library-tests/regex/parse.expected b/cpp/ql/test/library-tests/regex/parse.expected index 6eba9076ae4..a01d9f6a61e 100644 --- a/cpp/ql/test/library-tests/regex/parse.expected +++ b/cpp/ql/test/library-tests/regex/parse.expected @@ -86,10 +86,6 @@ #-----| [RegExpConstant, RegExpEscape] \t -#-----| [RegExpCharacterClassEscape] \h - -#-----| [RegExpCharacterClassEscape] \H - #-----| [RegExpCharacterClassEscape] \d #-----| [RegExpCharacterClassEscape] \D @@ -226,10 +222,6 @@ #-----| 1 -> [RegExpConstant, RegExpEscape] \r #-----| 2 -> [RegExpConstant, RegExpEscape] \t -#-----| [RegExpSequence] \h\H -#-----| 0 -> [RegExpCharacterClassEscape] \h -#-----| 1 -> [RegExpCharacterClassEscape] \H - #-----| [RegExpSequence] \d\D #-----| 0 -> [RegExpCharacterClassEscape] \d #-----| 1 -> [RegExpCharacterClassEscape] \D diff --git a/cpp/ql/test/library-tests/regex/regexp.cpp b/cpp/ql/test/library-tests/regex/regexp.cpp index e323213ef23..4dc78d789f3 100644 --- a/cpp/ql/test/library-tests/regex/regexp.cpp +++ b/cpp/ql/test/library-tests/regex/regexp.cpp @@ -47,7 +47,6 @@ std::regex r_meta1m(".*"); // /.*/m mode variant — mode flags are constructor std::regex r_meta2("\\w+\\W"); std::regex r_meta3("\\s\\S"); std::regex r_meta4("\\d\\D"); -std::regex r_meta5("\\h\\H"); std::regex r_meta6("\\n\\r\\t"); // Anchors diff --git a/cpp/ql/test/library-tests/regex/regexp.expected b/cpp/ql/test/library-tests/regex/regexp.expected index 31168fbae14..770d2f201dd 100644 --- a/cpp/ql/test/library-tests/regex/regexp.expected +++ b/cpp/ql/test/library-tests/regex/regexp.expected @@ -76,7 +76,6 @@ term | file://:0:0:0:0 | \\1 | RegExpBackRef | | file://:0:0:0:0 | \\B | RegExpNonWordBoundary | | file://:0:0:0:0 | \\D | RegExpCharacterClassEscape | -| file://:0:0:0:0 | \\H | RegExpCharacterClassEscape | | file://:0:0:0:0 | \\P{Digit} | RegExpNamedCharacterProperty | | file://:0:0:0:0 | \\P{Digit}+ | RegExpPlus | | file://:0:0:0:0 | \\S | RegExpCharacterClassEscape | @@ -88,8 +87,6 @@ term | file://:0:0:0:0 | \\b!a\\B | RegExpSequence | | file://:0:0:0:0 | \\d | RegExpCharacterClassEscape | | file://:0:0:0:0 | \\d\\D | RegExpSequence | -| file://:0:0:0:0 | \\h | RegExpCharacterClassEscape | -| file://:0:0:0:0 | \\h\\H | RegExpSequence | | file://:0:0:0:0 | \\k | RegExpBackRef | | file://:0:0:0:0 | \\k+ | RegExpPlus | | file://:0:0:0:0 | \\n | RegExpConstant,RegExpEscape | @@ -208,13 +205,11 @@ regExpNormalCharValue | file://:0:0:0:0 | Z | Z | | file://:0:0:0:0 | [ | [ | | file://:0:0:0:0 | \\D | D | -| file://:0:0:0:0 | \\H | H | | file://:0:0:0:0 | \\S | S | | file://:0:0:0:0 | \\W | W | | file://:0:0:0:0 | \\[ | [ | | file://:0:0:0:0 | \\] | ] | | file://:0:0:0:0 | \\d | d | -| file://:0:0:0:0 | \\h | h | | file://:0:0:0:0 | \\n | \n | | file://:0:0:0:0 | \\n | \n | | file://:0:0:0:0 | \\r | \r |