Skip to content

rubocop: reduce every regex evaluation for performance #4934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
Merged

rubocop: reduce every regex evaluation for performance #4934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/fluent/config/literal_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ def scan_double_quoted_string
else
return string.join
end
elsif check(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/)
if s = check(/[^\\]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/)
elsif check(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/o)
if s = check(/[^\\]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/o)
string << s
end
skip(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/)
skip(/[^"]#{LINE_END_WITHOUT_SPACING_AND_COMMENT}/o)
elsif s = scan(/\\./)
string << eval_escape_char(s[1,1])
elsif skip(/\#\{/)
Expand Down
4 changes: 2 additions & 2 deletions lib/fluent/config/v1_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def parse_element(root_element, elem_name, attrs = {}, elems = [])
elsif skip(/\</)
e_name = scan(ELEMENT_NAME)
spacing
e_arg = scan_string(/(?:#{ZERO_OR_MORE_SPACING}\>)/)
e_arg = scan_string(/(?:#{ZERO_OR_MORE_SPACING}\>)/o)
spacing
unless skip(/\>/)
parse_error! "expected '>'"
Expand All @@ -98,7 +98,7 @@ def parse_element(root_element, elem_name, attrs = {}, elems = [])
new_e.v1_config = true
elems << new_e

elsif root_element && skip(/(\@include|include)#{SPACING}/)
elsif root_element && skip(/(\@include|include)#{SPACING}/o)
if !prev_match.start_with?('@')
@logger.warn "'include' is deprecated. Use '@include' instead" if @logger
end
Expand Down