diff options
| author | Jack Nagel | 2014-02-13 15:38:39 -0500 | 
|---|---|---|
| committer | Jack Nagel | 2014-02-13 15:39:13 -0500 | 
| commit | 257a2206a41d0b75ea3e07067e12dec9d06c0e2d (patch) | |
| tree | 11bd1f6135ff2996400781a0be13ad02e5dc4742 /Library/Homebrew/dependency.rb | |
| parent | 8d5f0d8bb3037bb4de4dfef7ff654cecf87a0f73 (diff) | |
| download | brew-257a2206a41d0b75ea3e07067e12dec9d06c0e2d.tar.bz2 | |
Eliminate unnecessary arrays and call to flatten
Diffstat (limited to 'Library/Homebrew/dependency.rb')
| -rw-r--r-- | Library/Homebrew/dependency.rb | 17 | 
1 files changed, 10 insertions, 7 deletions
| diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index 1ed921cc3..9bbe68fb5 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -76,19 +76,22 @@ class Dependency      # The default filter, which is applied when a block is not given, omits      # optionals and recommendeds based on what the dependent has asked for.      def expand(dependent, deps=dependent.deps, &block) -      expanded_deps = deps.map do |dep| +      expanded_deps = [] + +      deps.each do |dep|          case action(dependent, dep, &block)          when :prune -          next [] +          next          when :skip -          expand(dep.to_formula, &block) +          expanded_deps.concat(expand(dep.to_formula, &block))          when :keep_but_prune_recursive_deps -          [dep] +          expanded_deps << dep          else -          next [] if dependent.to_s == dep.name -          expand(dep.to_formula, &block) << dep +          next if dependent.to_s == dep.name +          expanded_deps.concat(expand(dep.to_formula, &block)) +          expanded_deps << dep          end -      end.flatten +      end        merge_repeats(expanded_deps)      end | 
