diff options
| -rw-r--r-- | mrblib/hash.rb | 45 | ||||
| -rw-r--r-- | src/hash.c | 63 |
2 files changed, 45 insertions, 63 deletions
diff --git a/mrblib/hash.rb b/mrblib/hash.rb index c304d4845..f7cdbdc6d 100644 --- a/mrblib/hash.rb +++ b/mrblib/hash.rb @@ -24,6 +24,23 @@ class Hash # Calls the given block for each element of +self+ # and pass the key and value of each element. # + # call-seq: + # hsh.each {| key, value | block } -> hsh + # hsh.each_pair {| key, value | block } -> hsh + # hsh.each -> an_enumerator + # hsh.each_pair -> an_enumerator + # + # + # If no block is given, an enumerator is returned instead. + # + # h = { "a" => 100, "b" => 200 } + # h.each {|key, value| puts "#{key} is #{value}" } + # + # <em>produces:</em> + # + # a is 100 + # b is 200 + # # ISO 15.2.13.4.9 def each(&block) self.keys.each{|k| block.call([k, self[k]])} @@ -34,6 +51,20 @@ class Hash # Calls the given block for each element of +self+ # and pass the key of each element. # + # call-seq: + # hsh.each_key {| key | block } -> hsh + # hsh.each_key -> an_enumerator + # + # If no block is given, an enumerator is returned instead. + # + # h = { "a" => 100, "b" => 200 } + # h.each_key {|key| puts key } + # + # <em>produces:</em> + # + # a + # b + # # ISO 15.2.13.4.10 def each_key(&block) self.keys.each{|k| block.call(k)} @@ -44,6 +75,20 @@ class Hash # Calls the given block for each element of +self+ # and pass the value of each element. # + # call-seq: + # hsh.each_value {| value | block } -> hsh + # hsh.each_value -> an_enumerator + # + # If no block is given, an enumerator is returned instead. + # + # h = { "a" => 100, "b" => 200 } + # h.each_value {|value| puts value } + # + # <em>produces:</em> + # + # 100 + # 200 + # # ISO 15.2.13.4.11 def each_value(&block) self.keys.each{|k| block.call(self[k])} diff --git a/src/hash.c b/src/hash.c index 566d423a9..6910aec7f 100644 --- a/src/hash.c +++ b/src/hash.c @@ -790,69 +790,6 @@ mrb_hash_empty_p(mrb_state *mrb, mrb_value self) return mrb_bool_value(empty_p); } -/* 15.2.13.4.11 */ -/* - * call-seq: - * hsh.each_value {| value | block } -> hsh - * hsh.each_value -> an_enumerator - * - * Calls <i>block</i> once for each key in <i>hsh</i>, passing the - * value as a parameter. - * - * If no block is given, an enumerator is returned instead. - * - * h = { "a" => 100, "b" => 200 } - * h.each_value {|value| puts value } - * - * <em>produces:</em> - * - * 100 - * 200 - */ - -/* 15.2.13.4.10 */ -/* - * call-seq: - * hsh.each_key {| key | block } -> hsh - * hsh.each_key -> an_enumerator - * - * Calls <i>block</i> once for each key in <i>hsh</i>, passing the key - * as a parameter. - * - * If no block is given, an enumerator is returned instead. - * - * h = { "a" => 100, "b" => 200 } - * h.each_key {|key| puts key } - * - * <em>produces:</em> - * - * a - * b - */ - -/* 15.2.13.4.9 */ -/* - * call-seq: - * hsh.each {| key, value | block } -> hsh - * hsh.each_pair {| key, value | block } -> hsh - * hsh.each -> an_enumerator - * hsh.each_pair -> an_enumerator - * - * Calls <i>block</i> once for each key in <i>hsh</i>, passing the key-value - * pair as parameters. - * - * If no block is given, an enumerator is returned instead. - * - * h = { "a" => 100, "b" => 200 } - * h.each {|key, value| puts "#{key} is #{value}" } - * - * <em>produces:</em> - * - * a is 100 - * b is 200 - * - */ - static mrb_value inspect_hash(mrb_state *mrb, mrb_value hash, int recur) { |