klam 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4771dd4730c8a1d51d856e142bd5cf4565623996
-  data.tar.gz: 4d3745f65978183e00d3ad3f1682cec74f4b5efc
+  metadata.gz: c2e940a2764ea2672c7456f86bcac1607254edac
+  data.tar.gz: 3160eb40bd0f415fe39842345dcb21a0511a4a5d
 SHA512:
-  metadata.gz: 951c7347c2c432a9f39bfd6ab8f24ee782b1a2b42e82e1dbd1c394a84d86300e99892cc0d4bae7400ae74ae77183ecb294d87f62b1605cbf66b32b2217250e08
-  data.tar.gz: 4acc417beb7d6f3cec557493a5f92a88d29776689c444860a91922840ec2d91b1bd4b3336cd082808ed62b8cb37db15ae2ac8267156cf9ad80d318897b017bb9
+  metadata.gz: fb1f82664a88d71b4edcb4deeb4b59d7a4c60117b542881cbcc12d9135b6f871b906f923580f899a48c3f43cc5bf703c8a8cc58a21ab79106118687380c6861c
+  data.tar.gz: 9bf5e5d5e40188fc7dfd7a3de28557bfc64d579f46ede0cd9991300090b3fc1cbbff8b2939a9b9805576586544bfcb7770e02ea6fb17b9dab9662da31d9f14f7

data/HISTORY.asciidoc

@@ -1,6 +1,13 @@
 Relase History
 ==============
 
+v0.0.4 -- January 30, 2015
+--------------------------
+New Features
+~~~~~~~~~~~~
+* `Klam::Cons` is now enumerable
+* Added `rb-send-block` primitive
+
 v0.0.3 -- January 28, 2015
 --------------------------
 New Features

data/PROGRESS.asciidoc

@@ -94,14 +94,7 @@ Ruby Interoperation
 * Invoking Kl functions from Ruby
 * Invoking Ruby methods from Kl
 ** Without blocks
+** With blocks
 * Dereferencing Ruby constances from Kl
 * Ruby \<\-> Kl converters
 ** Array \<\-> List
-
-Not Yet Implemented
--------------------
-
-Ruby Interoperation
-~~~~~~~~~~~~~~~~~~~
-* Invoking Ruby methods from Kl
-** With blocks

data/lib/klam/cons.rb

@@ -1,5 +1,6 @@
 module Klam
   class Cons
+    include Enumerable
     attr_reader :hd, :tl
 
     def initialize(hd, tl)
@@ -14,5 +15,13 @@ module Klam
     def hash
       [@hd, @tl].hash
     end
+
+    def each
+      x = self
+      until x == Klam::Primitives::Lists::EMPTY_LIST
+        yield x.hd
+        x = x.tl
+      end
+    end
   end
 end

data/lib/klam/primitives/interop.rb

@@ -9,6 +9,20 @@ module Klam
       alias_method :"rb-send", :rb_send
       remove_method :rb_send
 
+      def rb_send_block(obj, method_name, blk_arity, blk, *args)
+        if blk.instance_of?(::Symbol)
+          # The caller won't take advantage of the currying, but we already
+          # are tracking the curried form. This also allows for paritial
+          # application of the named function, which could be interesting.
+          blk = @curried_methods[blk]
+        else
+          blk = ::Klam::Primitives::Interop.uncurry(blk, blk_arity)
+        end
+        obj.send(method_name, *args, &blk)
+      end
+      alias_method :"rb-send-block", :rb_send_block
+      remove_method :rb_send_block
+
       if RUBY_VERSION < '2.'
         def rb_const(name)
           parts = name.to_s.split('::')
@@ -25,6 +39,47 @@ module Klam
 
       alias_method :"rb-const", :rb_const
       remove_method :rb_const
+
+      class << self
+        def uncurry(blk, blk_arity)
+          case blk_arity
+          when 0
+            uncurry0(blk)
+          when 1
+            blk
+          when 2
+            uncurry2(blk)
+          when 3
+            uncurry2(blk)
+          when 4
+            uncurry2(blk)
+          when 5
+            uncurry2(blk)
+          else
+            ::Kernel.raise ::Klam::Error, "unsupported arity: #{blk_arity}"
+          end
+        end
+
+        def uncurry0(blk)
+          -> { blk.call(:NIL) }
+        end
+
+        def uncurry2(blk)
+          -> a, b { blk.call(a).call(b) }
+        end
+
+        def uncurry3(blk)
+          -> a, b, c { blk.call(a).call(b).call(c) }
+        end
+
+        def uncurry4(blk)
+          -> a, b, c, d { blk.call(a).call(b).call(c).call(d) }
+        end
+
+        def uncurry5(blk)
+          -> a, b, c, d, e { blk.call(a).call(b).call(c).call(d).call(e) }
+        end
+      end
     end
   end
 end

data/lib/klam/version.rb

@@ -1,3 +1,3 @@
 module Klam
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/functional/extensions/interop_spec.rb

@@ -7,6 +7,29 @@ describe 'extension: Ruby interop primitives', :type => :functional do
     end
   end
 
+  describe 'rb-send-block' do
+    it 'invokes a method on a Ruby object, passing the provided block' do
+      code = '(rb-send-block (cons 1 (cons 2 ())) map 1 (lambda X (* 2 X)))'
+      expect_kl(code).to eq([2, 4])
+    end
+
+    it 'supports blocks with arity greater than 1' do
+      eval_kl('(set vec (absvector 2))')
+      result = eval_kl <<-EOKL
+        (let V (absvector 2)
+          (do (rb-send-block (cons 1 (cons 2 ())) each_with_index 2
+                             (lambda X (lambda Y (address-> V Y X))))
+              V))
+      EOKL
+      expect(result).to eq([1, 2])
+    end
+
+    it 'supports symbols as blocks' do
+      eval_kl('(set vec (absvector 2))')
+      expect_kl('(rb-send-block (cons 1 (cons 2())) map 1 str)').to eq(%w{1 2})
+    end
+  end
+
   describe 'rb-const' do
     it 'looks up the named constant in the Ruby environment' do
       expect_kl('(rb-const "::Math::PI")').to eq(Math::PI)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klam
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Greg Spurrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake