summaryrefslogtreecommitdiffhomepage
path: root/mrblib
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-05-06 18:24:39 +0800
committerDaniel Bovensiepen <[email protected]>2012-05-06 18:24:39 +0800
commit580b0267a8590fc426f0ad9b77ab7b3f4448de24 (patch)
treee877d4cedfeb5712708bfd1983fbe5cb938312a7 /mrblib
parentdea4ccdd97b4ccb3a875e5b96036e03e5a25c1ae (diff)
downloadmruby-580b0267a8590fc426f0ad9b77ab7b3f4448de24.tar.gz
mruby-580b0267a8590fc426f0ad9b77ab7b3f4448de24.zip
Some fixes for the Documentation of Hash and Kernel
Diffstat (limited to 'mrblib')
-rw-r--r--mrblib/hash.rb12
-rw-r--r--mrblib/kernel.rb4
2 files changed, 7 insertions, 9 deletions
diff --git a/mrblib/hash.rb b/mrblib/hash.rb
index b32c30b83..d6ad55e47 100644
--- a/mrblib/hash.rb
+++ b/mrblib/hash.rb
@@ -61,13 +61,11 @@ class Hash
##
# Return a hash which contains the content of
# +self+ and +other+. If a block is given
- # call the block for each duplicate key and
- # pass the key, old value and new value.
- # The value of the block will be replacing
- # the duplicate element in the has which will
- # be returned.
- #
- # 15.2.13.4.22
+ # it will be called for each element with
+ # a duplicate key. The value of the block
+ # will be the final value of this element.
+ #
+ # ISO 15.2.13.4.22
def merge(other, &block)
h = {}
raise "can't convert argument into Hash" unless other.respond_to?(:to_hash)
diff --git a/mrblib/kernel.rb b/mrblib/kernel.rb
index fd4c86c38..2e017f818 100644
--- a/mrblib/kernel.rb
+++ b/mrblib/kernel.rb
@@ -38,7 +38,7 @@ module Kernel
end
##
- # Alias for Kernel.lambda.
+ # Alias for +Kernel.lambda+.
#
# 15.3.1.3.27
def lambda(&block)
@@ -47,7 +47,7 @@ module Kernel
end
##
- # Alias for Kernel.loop.
+ # Alias for +Kernel.loop+.
#
# ISO 15.3.1.3.29
def loop #(&block)