diff --git a/Libraries/LibRegex/RegexMatcher.h b/Libraries/LibRegex/RegexMatcher.h index 158eab716fc..4611ef278ab 100644 --- a/Libraries/LibRegex/RegexMatcher.h +++ b/Libraries/LibRegex/RegexMatcher.h @@ -200,13 +200,13 @@ RegexResult match(const Vector view, Regex& pattern, Op } template -bool match(const RegexStringView view, Regex& pattern, RegexResult& res, Optional::OptionsType> regex_options = {}) +bool match(const RegexStringView view, Regex& pattern, RegexResult&, Optional::OptionsType> regex_options = {}) { return pattern.match(view, regex_options); } template -bool match(const Vector view, Regex& pattern, RegexResult& res, Optional::OptionsType> regex_options = {}) +bool match(const Vector view, Regex& pattern, RegexResult&, Optional::OptionsType> regex_options = {}) { return pattern.match(view, regex_options); } @@ -224,13 +224,13 @@ RegexResult search(const Vector views, Regex& pattern, } template -bool search(const RegexStringView view, Regex& pattern, RegexResult& res, Optional::OptionsType> regex_options = {}) +bool search(const RegexStringView view, Regex& pattern, RegexResult&, Optional::OptionsType> regex_options = {}) { return pattern.search(view, regex_options); } template -bool search(const Vector views, Regex& pattern, RegexResult& res, Optional::OptionsType> regex_options = {}) +bool search(const Vector views, Regex& pattern, RegexResult&, Optional::OptionsType> regex_options = {}) { return pattern.search(views, regex_options); } diff --git a/Libraries/LibRegex/RegexParser.cpp b/Libraries/LibRegex/RegexParser.cpp index cc52649eafc..f39fc4c5a37 100644 --- a/Libraries/LibRegex/RegexParser.cpp +++ b/Libraries/LibRegex/RegexParser.cpp @@ -1134,8 +1134,8 @@ bool ECMA262Parser::parse_atom_escape(ByteCode& stack, size_t& match_length_mini Vector compares; if (negate) - compares.empend(CharacterCompareType::Inverse, 0); - compares.empend(CharacterCompareType::CharClass, (ByteCodeValueType)ch.value()); + compares.empend(CompareTypeAndValuePair { CharacterCompareType::Inverse, 0 }); + compares.empend(CompareTypeAndValuePair { CharacterCompareType::CharClass, (ByteCodeValueType)ch.value() }); match_length_minimum += 1; stack.insert_bytecode_compare_values(move(compares)); return true; @@ -1179,7 +1179,7 @@ bool ECMA262Parser::parse_character_class(ByteCode& stack, size_t& match_length_ if (match(TokenType::Circumflex)) { // Negated charclass consume(); - compares.empend(CharacterCompareType::Inverse, 0); + compares.empend(CompareTypeAndValuePair { CharacterCompareType::Inverse, 0 }); } if (match(TokenType::RightBracket)) { @@ -1338,7 +1338,7 @@ bool ECMA262Parser::parse_nonempty_class_ranges(Vector& ASSERT(!first_atom.value().is_negated); ASSERT(!second_atom.value().is_negated); - ranges.empend(CharacterCompareType::CharRange, CharRange { first_atom.value().code_point, second_atom.value().code_point }); + ranges.empend(CompareTypeAndValuePair { CharacterCompareType::CharRange, CharRange { first_atom.value().code_point, second_atom.value().code_point } }); continue; } @@ -1348,11 +1348,11 @@ bool ECMA262Parser::parse_nonempty_class_ranges(Vector& if (atom.is_character_class) { if (atom.is_negated) - ranges.empend(CharacterCompareType::TemporaryInverse, 0); - ranges.empend(CharacterCompareType::CharClass, (ByteCodeValueType)first_atom.value().character_class); + ranges.empend(CompareTypeAndValuePair { CharacterCompareType::TemporaryInverse, 0 }); + ranges.empend(CompareTypeAndValuePair { CharacterCompareType::CharClass, (ByteCodeValueType)first_atom.value().character_class }); } else { ASSERT(!atom.is_negated); - ranges.empend(CharacterCompareType::Char, first_atom.value().code_point); + ranges.empend(CompareTypeAndValuePair { CharacterCompareType::Char, first_atom.value().code_point }); } }