From e5a852b91285ca8fca806f4cc4ab0127fbf84d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 16 Apr 2022 12:01:50 +0200 Subject: [PATCH] [ruby/tsort] Small tweaks for easier vendoring 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 --- lib/tsort.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/tsort.rb b/lib/tsort.rb index 2760b7d57f..00ee609d64 100644 --- a/lib/tsort.rb +++ b/lib/tsort.rb @@ -172,8 +172,8 @@ module TSort # each_child = lambda {|n, &b| g[n].each(&b) } # p TSort.tsort(each_node, each_child) # raises TSort::Cyclic # - def TSort.tsort(each_node, each_child) - TSort.tsort_each(each_node, each_child).to_a + def self.tsort(each_node, each_child) + tsort_each(each_node, each_child).to_a end # The iterator version of the #tsort method. @@ -220,10 +220,10 @@ module TSort # # 3 # # 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? - TSort.each_strongly_connected_component(each_node, each_child) {|component| + each_strongly_connected_component(each_node, each_child) {|component| if component.size == 1 yield component.first else @@ -277,8 +277,8 @@ module TSort # p TSort.strongly_connected_components(each_node, each_child) # #=> [[4], [2, 3], [1]] # - def TSort.strongly_connected_components(each_node, each_child) - TSort.each_strongly_connected_component(each_node, each_child).to_a + def self.strongly_connected_components(each_node, each_child) + each_strongly_connected_component(each_node, each_child).to_a end # The iterator version of the #strongly_connected_components method. @@ -339,14 +339,14 @@ module TSort # # [2, 3] # # [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? id_map = {} stack = [] each_node.call {|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 } end @@ -405,7 +405,7 @@ module TSort # # [2, 3] # # [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? 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 else 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 } minimum_id = sub_minimum_id if sub_minimum_id < minimum_id