funtools 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0faa0f3d082df30457dbd13eae82d9d78b582cda
-  data.tar.gz: ea596071898a6e7eca90869cc3b31fba9165c8b6
+  metadata.gz: 760735a64660eda23cf109045b3696041da6e8a4
+  data.tar.gz: 610702e131264a06618c6e4a31b7742ca5e7e623
 SHA512:
-  metadata.gz: 5397fff059b62f1b280866424d72fcb28724ca691246cd7f350a0c0439b889dc0bcc57e31a4131b0b775400da0a348c00fad2028409e491fa44dc777cf6b1875
-  data.tar.gz: 510345cfabb0889d1debd002ac34624309358e040d02132824e97ebba5f59bd77347baa78550a9edd79664ecfb8b993e92a09b213850993e9efcda21fa6821ca
+  metadata.gz: 225ca09218729ba85fab9a6fa331b1d8f3d3fd7a6a857ae28f06cb945e7c26daaf5da98f7797a6a054477a294f73463d78cd239d175a6ed919bf2a14e9af1f39
+  data.tar.gz: d340f6d4c99996b7202f4a7ce1273d8850f68e6c842800646186a838781af57aa7b1a0240c0428df924e080841b523f1fe2a1fba121c43d2327cd195e60dedcd

data/lib/funtools/cons.rb

@@ -46,20 +46,20 @@ class Cons
   # Yields each element.
   def each(&block)
     block.(car)
-    right = cdr
+    left, right = car, 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
+        if left.is_a?(Cons)
           block.(right)
           right = nil
+        else
+          block.(right.car)
+          left, right = right.car, right.cdr
         end
       else
-        block.(right) unless right.nil?
-        right = nil
+          block.(right) unless right.nil?
+          right = nil
       end
     end
   end
@@ -78,15 +78,14 @@ class Cons
   #
   # 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|
+    result = [self]
+    while result.grep(Cons).any?
+      result = result.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.flatten
+    end
+    result.map(&:to_s).join
   end
   alias :to_s :inspect
 end

data/lib/funtools.rb

@@ -4,5 +4,5 @@ require 'funtools/composition'
 require 'funtools/pattern-matching'
 
 module Funtools
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: funtools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tina Wuest