Permalink
Browse files

simplifies a regexp

We simplify two things here: First since * is greedy it is enough to go
look for the rightmost ::, no need to ask the regexp engine to match the
rest of the string since we are not validating anything, only capturing.
The second simplification comes from using a look-ahead assertion, that
allows us to have the capture in $&, thus removing the need of a group.
  • Loading branch information...
1 parent 9cbb6d2 commit 148e33058cf4b8c6197bdc8c78b28bfd018d051f @fxn fxn committed Aug 25, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/dependencies.rb
@@ -443,7 +443,7 @@ def autoload_module!(into, const_name, qualified_name, path_suffix)
def load_file(path, const_paths = loadable_constants_for_path(path))
log_call path, const_paths
const_paths = [const_paths].compact unless const_paths.is_a? Array
- parent_paths = const_paths.collect { |const_path| /(.*)::[^:]+\Z/ =~ const_path ? $1 : :Object }
+ parent_paths = const_paths.collect { |const_path| /.*(?=::)/ =~ const_path ? $& : :Object }
result = nil
newly_defined_paths = new_constants_in(*parent_paths) do

0 comments on commit 148e330

Please sign in to comment.