Merge pull request #499 from kostya/master

Object#tap

AUTHORS.rst

@@ -18,3 +18,4 @@ Authors
 * Armin Rigo
 * Robin Schreiber
 * Jeremy Thurgood
+* Konstantin Makarchev

spec/tags/core/kernel/tap_tags.txt

@@ -1,2 +0,0 @@
-fails:Kernel#tap always yields self and returns self
-fails:Kernel#tap raises a LocalJumpError when no block given

tests/objects/test_objectobject.py

@@ -389,3 +389,24 @@ class A; def to_str; "to_s"; end; end
         return 'aaa'.method(A.new).class
         """)
         assert self.unwrap(space, w_res) == space.getclassfor(W_MethodObject)
+
+    def test_tap(self, space):
+        with self.raises(space, "LocalJumpError"):
+            space.execute("1.tap")
+
+        with self.raises(space, "LocalJumpError"):
+            space.execute("'1'.tap")
+
+        w_res = space.execute("""
+        x = nil
+        1.tap{ |c| x = c }
+        return x
+        """)
+        assert self.unwrap(space, w_res) == 1
+
+        w_res = space.execute("""
+        x = nil
+        [].tap{ |c| x = c }
+        return x
+        """)
+        assert self.unwrap(space, w_res) == []

topaz/objects/objectobject.py

@@ -181,6 +181,14 @@ def method_method(self, space, w_sym):
             [self]
         )
 
+    @classdef.method("tap")
+    def method_tap(self, space, block=None):
+        if block is not None:
+           space.invoke_block(block, [self])
+        else:
+           raise space.error(space.w_LocalJumpError, "no block given")
+        return self
+
 
 class W_Object(W_RootObject):
     _attrs_ = ["map", "storage"]