funtools 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147a7fd803443d3bc56481e35023bfe25a9c6510
-  data.tar.gz: 81b7a9752e0bc7af02b4a713e77fa0b88afa67e7
+  metadata.gz: 0faa0f3d082df30457dbd13eae82d9d78b582cda
+  data.tar.gz: ea596071898a6e7eca90869cc3b31fba9165c8b6
 SHA512:
-  metadata.gz: 7991f402cc958d2872f038e2d48ad180224771a5488a7500744b97955b5a7db227f3b6d306bc6f13eb267391e84f6fb64ddd89ef4a8c791a2fd7bf5c1dc2b046
-  data.tar.gz: b372da0baad485064622feceb0fecccae595a8b2273a6f20beadb61816055e7fc0daac467a0eba2577a12b7bf7ebd2f7a9a2d06aade9cc1325787ba9c856f1fd
+  metadata.gz: 5397fff059b62f1b280866424d72fcb28724ca691246cd7f350a0c0439b889dc0bcc57e31a4131b0b775400da0a348c00fad2028409e491fa44dc777cf6b1875
+  data.tar.gz: 510345cfabb0889d1debd002ac34624309358e040d02132824e97ebba5f59bd77347baa78550a9edd79664ecfb8b993e92a09b213850993e9efcda21fa6821ca

data/lib/funtools/cons.rb

@@ -0,0 +1,92 @@
+class Object
+  # Public: Wrap Cons.new to construct a new Cons cell.
+  #
+  # left  - Any Object to be the left element of the cell.
+  # right - Any Object to be the right element of the cell.
+  #
+  # Returns a Cons cell.
+  def cons(left, right)
+    Cons.new(left, right)
+  end
+
+  # Public: Construct a list of nested Cons cells.
+  #
+  # first  - Any Object to be the leftmost element of the list.
+  # second - Any Object to be the second element of the list (default: nil).
+  # rest   - Any number of Objects to serve as elements in the list.
+  #
+  # Returns a list (nested Cons cells).
+  def list(first, second = nil, *rest)
+    set = (rest.empty? && second.nil?) ? [] : rest + [nil]
+    ([first, second] + set).reverse.reduce { |c, e| Cons.new(e, c) }
+  end
+end
+
+class Cons
+  include Enumerable
+
+  attr_reader :car, :cdr
+
+  alias :head :car
+  alias :tail :cdr
+
+  # Public: Create a Cons cell.
+  #
+  # left  - Any Object to be the left element of the cell.
+  # right - Any Object to be the right element of the cell.
+  def initialize(left, right)
+    @car = left
+    @cdr = right
+  end
+
+  # Public: Iterate through each element of a Cons cell/list.  Note that Cons
+  # cells will be yielded without inspecting their contents if they are in the
+  # left position of a parent Cons cell.
+  #
+  # Yields each element.
+  def each(&block)
+    block.(car)
+    right = cdr
+
+    while right
+      if right.is_a?(Cons)
+        if [right.car, right.cdr].grep(Cons).any? || right.cdr.nil?
+          block.(right.car)
+          right = right.cdr
+        else
+          block.(right)
+          right = nil
+        end
+      else
+        block.(right) unless right.nil?
+        right = nil
+      end
+    end
+  end
+
+  # Public: Determine whether two Cons cells/lists are equivalent.
+  #
+  # other - Object to be compared against.
+  #
+  # Returns true or false.
+  def ==(other)
+    return false unless other.is_a?(Cons)
+    to_a == other.to_a
+  end
+
+  # Public: Produce a string representation of a Cons cell/list.
+  #
+  # Returns a String.
+  def inspect
+    last = nil
+    r = [1].cycle.reduce([self]) do |c,_|
+      break c if c == last
+      last = c
+      c.flatten.map do |e|
+        e.is_a?(Cons) ? ['(', e.to_a.zip([' '].cycle).flatten[0..-2], ')'] :
+        e.nil? ? 'nil' : e
+      end
+    end.map(&:to_s).join
+  end
+  alias :to_s :inspect
+end

data/lib/funtools/pattern-matching.rb

@@ -7,20 +7,31 @@ class Object
   #
   # Returns nothing.
   def defpattern(sym)
+    match = ->(a, b) do
+      if([a,b].map { |o| o.is_a?(Enumerable) && a.class == b.class }.all?)
+        raise ArgumentError unless a.length == b.length
+
+        zipped = a.is_a?(Hash) ? a.sort.zip(b.sort) : a.zip(b)
+
+        zipped.reduce(true) do |c, e|
+          c && match.(*e)
+        end
+      else
+        a.nil? || a == b
+      end
+    end
+
     old_method = self.class.method(sym) if self.class.method_defined?(:sym)
     patterns = []
     self.class.send(:define_method, sym) do |*l, &b|
       patterns << ->(*n) do
         ->(*m) do
-          flat_m = m.flatten
-          flat_n = n.flatten
-          if flat_m.length == flat_n.length
-            e = flat_m.zip(n.flatten)
-            unless e.reject { |e| e[0].nil? || e[0]==e[1] }.any?
-              instance_exec(*flat_n, &b)
-            end
+          if m.length == n.length
+            e = m.zip(n)
+            raise NoMatch if e.reject { |e| match.(*e) }.any?
+            instance_exec(*n, &b)
           end
-        end.(l.flatten)
+        end.(*l)
       end
     end
 
@@ -36,10 +47,14 @@ class Object
     message ||= :define_singleton_method
     self.send(message, sym) do |*args|
       patterns.each do |pattern|
-        result = instance_exec(*args, &pattern)
-        return result unless result.nil?
+        begin
+          return instance_exec(*args, &pattern)
+        rescue NoMatch
+        end
       end
-      nil
+      instance_exec { raise NoMatch }
     end
   end
 end
+
+class NoMatch < ArgumentError; end

data/lib/funtools.rb

@@ -1,7 +1,8 @@
+require 'funtools/cons'
 require 'funtools/recursion'
 require 'funtools/composition'
 require 'funtools/pattern-matching'
 
 module Funtools
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funtools
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tina Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies: []
 description: Tools to assist in programming in a more functional style
 email: tina@wuest.me
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - lib/funtools.rb
 - lib/funtools/composition.rb
+- lib/funtools/cons.rb
 - lib/funtools/pattern-matching.rb
 - lib/funtools/recursion.rb
 homepage: https://gitlab.com/wuest/funtools