Open
Conversation
denisichh
added
runtime
apolyakov
requested changes
May 5, 2026
| kphp::pcre2::match_context match_context; | ||
| kphp::pcre2::match_data match_data; | ||
|
|
||
| RegexInstanceState() |
| kphp::pcre2::match_data match_data; | ||
|
|
||
| RegexInstanceState() noexcept | ||
| RegexBaseState() noexcept |
Contributor
There was a problem hiding this comment.
Let's hide it in kphp::regex::details namespace
| } | ||
|
|
||
| template<typename... Args> | ||
| void pattern_compilation_warning(const char* function, const char* file, std::format_string<kphp::log::impl::wrapped_arg_t<Args>...> fmt, |
Contributor
There was a problem hiding this comment.
Do we really need separate logging utility for regexp?
| Args&&... args) const noexcept { | ||
| static constexpr size_t LOG_BUFFER_SIZE = 256UZ; | ||
| std::array<char, LOG_BUFFER_SIZE> log_buffer; // NOLINT | ||
| const size_t message_size{kphp::log::impl::format_log_message(log_buffer, fmt, std::forward<Args>(args)...)}; |
| namespace kphp::regex { | ||
| class regexp final { | ||
| private: | ||
| void compile_regex(RegexBaseState& regex_state, const string& pattern, const string& subject = {}, const char* function = nullptr, |
Contributor
There was a problem hiding this comment.
- Shouldn't we take
patternandsubjectby copy? - Can we get rid of raw pointers?
| } | ||
| } | ||
|
|
||
| std::optional<std::reference_wrapper<const kphp::pcre2::regex>> _re{}; |
Contributor
There was a problem hiding this comment.
- Maybe rename to
m_reto follow existing naming policies? - Redundant init for this member
| _re = regex_state.add_compiled_regex(pattern, this->compile_options, std::move(re))->get().regex_code; | ||
| } | ||
|
|
||
| std::optional<bool> find_compiled_regex(const RegexBaseState& regex_state, const string& pattern) noexcept { |
Contributor
There was a problem hiding this comment.
Isn't bool as a return type enough here?
| return true; | ||
| } | ||
|
|
||
| inline Optional<int64_t> preg_match_base(const regexp& regex, const string& subject, |
Contributor
There was a problem hiding this comment.
Common note: let's avoid generic names like *base*. Can we use some specific name that reflects what the function actually does instead?
|
|
||
| static constexpr size_t MAX_SUBPATTERNS_COUNT{512}; | ||
|
|
||
| kphp::stl::unordered_map<string, compiled_regex, kphp::memory::script_allocator, hasher_type> regex_pcre2_code_cache; |
Contributor
There was a problem hiding this comment.
As now it's also used in *ImageState, we must ensure that all string objects in this map have their reference counter set to ExtraRefCnt::for_global_const
| auto group_names{kphp::regex::details::collect_group_names(re)}; | ||
| auto unsigned_limit{limit == kphp::regex::PREG_NOLIMIT ? std::numeric_limits<uint64_t>::max() : static_cast<uint64_t>(limit)}; | ||
| regex_info.replace_count = 0; | ||
| int64_t replace_count = 0; |
Contributor
There was a problem hiding this comment.
Please, use braced init here
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.