kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/tsort] Small tweaks for easier vendoring

Browse source 
Bundler vendors this file and we have some tools to automatically
prepend the `Bundler::` namespace so that the vendored version does not
collide with the stdlib version.

However, due to how methods are defined, it's hard for our vendoring
tool to do the right thing.

I think this makes the code simpler and things easier for us too.

https://github.com/ruby/tsort/commit/7088a7c814
This commit is contained in:
David Rodríguez 2022-04-16 12:01:50 +02:00 committed by git
parent 8c4ed2d777
commit e5a852b912
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/tsort.rb
View file

@ -172,8 +172,8 @@ module TSort
# each_child = lambda {|n, &b| g[n].each(&b) } # each_child = lambda {|n, &b| g[n].each(&b) }
# p TSort.tsort(each_node, each_child) # raises TSort::Cyclic # p TSort.tsort(each_node, each_child) # raises TSort::Cyclic
# #
def TSort.tsort(each_node, each_child) def self.tsort(each_node, each_child)
TSort.tsort_each(each_node, each_child).to_a tsort_each(each_node, each_child).to_a
end end
# The iterator version of the #tsort method. # The iterator version of the #tsort method.
@ -220,10 +220,10 @@ module TSort
# # 3 # # 3
# # 1 # # 1
# #
def TSort.tsort_each(each_node, each_child) # :yields: node def self.tsort_each(each_node, each_child) # :yields: node
return to_enum(__method__, each_node, each_child) unless block_given? return to_enum(__method__, each_node, each_child) unless block_given?
TSort.each_strongly_connected_component(each_node, each_child) {|component| each_strongly_connected_component(each_node, each_child) {|component|
if component.size == 1 if component.size == 1
yield component.first yield component.first
else else
@ -277,8 +277,8 @@ module TSort
# p TSort.strongly_connected_components(each_node, each_child) # p TSort.strongly_connected_components(each_node, each_child)
# #=> [[4], [2, 3], [1]] # #=> [[4], [2, 3], [1]]
# #
def TSort.strongly_connected_components(each_node, each_child) def self.strongly_connected_components(each_node, each_child)
TSort.each_strongly_connected_component(each_node, each_child).to_a each_strongly_connected_component(each_node, each_child).to_a
end end
# The iterator version of the #strongly_connected_components method. # The iterator version of the #strongly_connected_components method.
@ -339,14 +339,14 @@ module TSort
# # [2, 3] # # [2, 3]
# # [1] # # [1]
# #
def TSort.each_strongly_connected_component(each_node, each_child) # :yields: nodes def self.each_strongly_connected_component(each_node, each_child) # :yields: nodes
return to_enum(__method__, each_node, each_child) unless block_given? return to_enum(__method__, each_node, each_child) unless block_given?
id_map = {} id_map = {}
stack = [] stack = []
each_node.call {|node| each_node.call {|node|
unless id_map.include? node unless id_map.include? node
TSort.each_strongly_connected_component_from(node, each_child, id_map, stack) {|c| each_strongly_connected_component_from(node, each_child, id_map, stack) {|c|
yield c yield c
} }
end end
@ -405,7 +405,7 @@ module TSort
# # [2, 3] # # [2, 3]
# # [1] # # [1]
# #
def TSort.each_strongly_connected_component_from(node, each_child, id_map={}, stack=[]) # :yields: nodes def self.each_strongly_connected_component_from(node, each_child, id_map={}, stack=[]) # :yields: nodes
return to_enum(__method__, node, each_child, id_map, stack) unless block_given? return to_enum(__method__, node, each_child, id_map, stack) unless block_given?
minimum_id = node_id = id_map[node] = id_map.size minimum_id = node_id = id_map[node] = id_map.size
@ -418,7 +418,7 @@ module TSort
minimum_id = child_id if child_id && child_id < minimum_id minimum_id = child_id if child_id && child_id < minimum_id
else else
sub_minimum_id = sub_minimum_id =
TSort.each_strongly_connected_component_from(child, each_child, id_map, stack) {|c| each_strongly_connected_component_from(child, each_child, id_map, stack) {|c|
yield c yield c
} }
minimum_id = sub_minimum_id if sub_minimum_id < minimum_id minimum_id = sub_minimum_id if sub_minimum_id < minimum_id