Eliminate unnecessary arrays and call to flatten
This commit is contained in:
parent
8d5f0d8bb3
commit
257a2206a4
@ -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
|
||||
end.flatten
|
||||
|
||||
merge_repeats(expanded_deps)
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user