church 0.1.5 → 0.1.6

data/lib/church/array.rb

@@ -12,24 +12,22 @@ module Church
   # Maps fn over coll in-place, modifying the original collection.
   MAP_BANG = -> coll, &fn {
     sz = SIZE[coll]
-    i = 0
 
-    (mapper = -> {
+    (mapper = -> i {
       coll[i] = fn[coll[i]]
-      (i += 1) == sz ? coll : mapper[]
-    })[]
+      (i += 1) == sz ? coll : mapper[i]
+    })[0]
   }
 
   # Reduces fn over coll.
   REDUCE = -> coll, &fn {
     sz = SIZE[coll]
     ret = coll[0]
-    i = 1
 
-    sz == 1 ? ret : (reducer = -> {
+    sz == 1 ? ret : (reducer = -> i {
       ret = fn[ret, coll[i]]
-      (i += 1) == sz ? ret : reducer[]
-    })[]
+      (i += 1) == sz ? ret : reducer[i]
+    })[1]
   }
 
   # Filters coll through fn.
@@ -40,36 +38,31 @@ module Church
   # Performs fn with each element of coll in turn.
   EACH = -> coll, &fn {
     sz = SIZE[coll]
-    i = 0
 
-    (eacher = -> {
+    (eacher = -> i {
       fn[coll[i]]
-      (i += 1) == sz ? coll : eacher[]
-    })[]
+      (i += 1) == sz ? coll : eacher[i]
+    })[0]
   }
 
   # Zips each element of coll with its index within the collection.
   INDEXED = -> coll {
     sz = SIZE[coll]
-    ret = []
-    i = 0
 
-    (indexer = -> {
+    (indexer = -> ret, i {
       ret << [coll[i], i]
-      (i += 1) == sz ? ret : indexer[]
-    })[]
+      (i += 1) == sz ? ret : indexer[ret, i]
+    })[[], 0]
   }
 
   # Reverses the collection.
   REVERSE = -> coll {
     sz = SIZE[coll]
-    ret = coll[0, 0]
-    i = sz
 
-    (reverser = -> {
+    (reverser = -> ret, i {
       ret << coll[i - 1]
-      (i -= 1) == 0 ? ret : reverser[]
-    })[]
+      (i -= 1) == 0 ? ret : reverser[ret, i]
+    })[coll[0, 0], sz]
   }
 
   # Sorts the collection.
@@ -92,6 +85,12 @@ module Church
   # Sorts the collection in reverse order.
   RSORT = COMPOSE[REVERSE, SORT]
 
+  # Returns the collection's minimum.
+  MIN = -> coll { SORT[coll][ 0] }
+
+  # Returns the collection's maximum.
+  MAX = -> coll { SORT[coll][-1] }
+
   # Returns the collection with the first n elements dropped.
   DROP = -> coll, n { coll[n..-1] }
 

data/lib/church/hash.rb

@@ -9,25 +9,21 @@ module Church
   INVERT = -> hash {
     ks, vs = KEYS[hash], VALUES[hash]
     sz = SIZE[ks]
-    ret = {}
-    i = 0
 
-    (inverter = -> {
+    (inverter = -> ret, i {
       ret[vs[i]] = ks[i]
-      (i += 1) == sz ? ret : inverter[]
-    })[]
+      (i += 1) == sz ? ret : inverter[ret, i]
+    })[{}, 0]
   }
 
   # Merges the keys and values of the two hashes into a new hash
   MERGE = -> a, b {
     all = [*a] + [*b]
     sz  = SIZE[all]
-    ret = {}
-    i = 0
 
-    (merger = -> {
+    (merger = -> ret, i {
       ret[all[i][0]] = all[i][1]
-      (i += 1) == sz ? ret : merger[]
-    })[]
+      (i += 1) == sz ? ret : merger[ret, i]
+    })[{}, 0]
   }
 end

data/lib/church/io.rb

@@ -18,13 +18,11 @@ module Church
   # Returns an array of the characters of a string
   CHARS = -> str {
     sz = SIZE[str]
-    ret = []
-    i = 0
 
-    (chars_p = -> {
+    (chars_p = -> ret, i {
       ret << str[i]
-      (i += 1) == sz ? ret : chars_p[]
-    })[]
+      (i += 1) == sz ? ret : chars_p[ret, i]
+    })[[], 0]
   }
 
   # Joins the collection into a string on a specified delimiter

data/lib/church/range.rb

@@ -0,0 +1,7 @@
+module Church
+  RANGE = -> start, finish, step = 1 {
+    (ranger = -> ret {
+      start >= finish ? ret : ranger[ret << start += step]
+    })[[start]]
+  }
+end

data/lib/church/version.rb

@@ -1,3 +1,3 @@
 module Church
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/church.rb

@@ -3,5 +3,6 @@ require 'church/array'
 require 'church/hash'
 require 'church/io'
 require 'church/math'
+require 'church/range'
 require 'church/utils'
 require 'church/version'

data/spec/array_spec.rb

@@ -73,6 +73,18 @@ describe 'RSORT' do
   end
 end
 
+describe 'MIN' do
+  it "should return the collection's minimum" do
+    expect(MIN[[2, 1, 3]]).to be 1
+  end
+end
+
+describe 'MAX' do
+  it "should return the collection's minimum" do
+    expect(MAX[[3, 1, 2]]).to be 3
+  end
+end
+
 describe 'INDEXED' do
   it "should zip a collection with indices" do
     expect(INDEXED[[1, 2, 3]]).to eq [[1, 0], [2, 1], [3, 2]]

data/spec/range_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+include Church
+
+describe 'RANGE' do
+  it "should work without a supplied step" do
+    expect(RANGE[1, 3]).to eq [1, 2, 3]
+  end
+
+  it "should work with a step" do
+    expect(RANGE[2, 6, 2]).to eq [2, 4, 6]
+  end
+
+  it "should work with a negative start" do
+    expect(RANGE[-1, 1]).to eq [-1, 0, 1]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: church
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -94,6 +94,7 @@ files:
 - lib/church/io.rb
 - lib/church/lambda.rb
 - lib/church/math.rb
+- lib/church/range.rb
 - lib/church/utils.rb
 - lib/church/version.rb
 - spec/array_spec.rb
@@ -101,6 +102,7 @@ files:
 - spec/io_spec.rb
 - spec/lambda_spec.rb
 - spec/math_spec.rb
+- spec/range_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 homepage: https://github.com/threeifbywhiskey/church
@@ -135,5 +137,6 @@ test_files:
 - spec/io_spec.rb
 - spec/lambda_spec.rb
 - spec/math_spec.rb
+- spec/range_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb