cons 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d83965d38be86303de5909d238c26a01b3b56b20
-  data.tar.gz: 6b36c974feeacafedcbc28bebb8a619b69461585
+  metadata.gz: 3af72cf8eb7e47ce6719d57dfbc24d454ca16d57
+  data.tar.gz: c533cff0121f20fb4b3e813e1eca7325543157ed
 SHA512:
-  metadata.gz: f4bfe703f2453a943042864b4bb50a9d288d47e19f5125dbb66ce36735e7e8e3a89e9248f57d9234610444f7c08b22c38094a9e90fcef2baef1691057eb1233b
-  data.tar.gz: a8a168c469442db0d8a86b12132207f0b5e5cbf2bb880ad98274ecf83bbd6f4be00e11aafd9c6fbffeb9ab25f00b6c1e71253ecc8c1459619b18b1abb674dfc8
+  metadata.gz: 62799c1404609bb90d35bdec58e5d9eaa9c642f8711d928503b32c8440d0acb7e7116ad66dd95593d5b976a10dc1642b56934fdaf076aa00bffd140051ee0905
+  data.tar.gz: e309acf9d74f46169764c6b934ea21cabc9685a76c6421a50eaa018d629268ab78f5804fbcd03d5485313af2f131d2cfdcdcfe763259063f9484577b7d423784

data/lib/cons.rb

@@ -58,17 +58,29 @@ class Cons
     rhs.kind_of? Cons and car == rhs.car and cdr == rhs.cdr
   end
 
+  def length
+    result = 0
+    current = self
+    while current and current.car and not current.car.nil?
+      result += 1
+      current = current.cdr
+    end
+    result
+  end
+
   alias first car
   alias first= car=
+  alias rplaca car=
   alias rest cdr
   alias rest= cdr=
+  alias rplacd cdr=
 
   def nthcdr n
     if not n.kind_of? Integer or n < 0
       raise ArgumentError, "n for nthcdr must be a non-negative integer"
-    elsif n == 1
+    elsif n == 0
       self
-    elsif n > 1
+    elsif n > 0
       if cdr.nil?
         nil
       else
@@ -86,8 +98,11 @@ class Cons
     end
   end
 
+  def [] n
+    nth n
+  end
+
   def nth_eq(n, value)
-    puts "nth= n=#{n} value=#{value}"
     i = nthcdr(n)
     if i.nil?
       raise RuntimeError
@@ -96,6 +111,10 @@ class Cons
     end
   end
 
+  def []= n, value
+    nth_eq n, value
+  end
+
   def first
     car
   end
@@ -104,15 +123,15 @@ class Cons
     @car = value
   end
 
-  [[:second, 2],
-   [:third, 3],
-   [:fourth, 4],
-   [:fifth, 5],
-   [:sixth, 6],
-   [:seventh, 7],
-   [:eighth, 8],
-   [:ninth, 9],
-   [:tenth, 10]].each do |fname, i|
+  [[:second, 1],
+   [:third, 2],
+   [:fourth, 3],
+   [:fifth, 4],
+   [:sixth, 5],
+   [:seventh, 6],
+   [:eighth, 7],
+   [:ninth, 8],
+   [:tenth, 9]].each do |fname, i|
     class_eval %{
       def #{fname}
         nth #{i}
@@ -175,18 +194,66 @@ class Cons
     end
   end
 
+  def copy_tree
+    new_car = if car.kind_of? Cons
+                car.copy_tree
+              else
+                car
+              end
+    new_cdr = if cdr.kind_of? Cons
+                cdr.copy_tree
+              else
+                cdr
+              end
+    Cons[new_car,new_cdr]
+  end
+
+  alias tree_copy copy_tree
+
+  ## Lots of TODOs from the CLHS
+  # TODO - append - http://clhs.lisp.se/Body/f_append.htm
+  # TODO - (n)butlast - http://clhs.lisp.se/Body/f_butlas.htm
+  # TODO - copy-alist - http://clhs.lisp.se/Body/f_cp_ali.htm
+  # TODO - copy-list - http://clhs.lisp.se/Body/f_cp_lis.htm
+  # TODO - endp - http://clhs.lisp.se/Body/f_endp.htm
+  # TODO - last - http://clhs.lisp.se/Body/f_last.htm
+  # TODO - ldiff, tailp - http://clhs.lisp.se/Body/f_ldiffc.htm
+  # TODO - list* - http://clhs.lisp.se/Body/f_list_.htm
+  # TODO - list-length - http://clhs.lisp.se/Body/f_list_l.htm
+  # TODO - member, member-if, member-if-not - http://clhs.lisp.se/Body/f_mem_m.htm
+  # TODO - nconc - http://clhs.lisp.se/Body/f_nconc.htm
+  # TODO - revappend, nreconc - http://clhs.lisp.se/Body/f_revapp.htm
+  # TODO - pop - http://clhs.lisp.se/Body/m_pop.htm
+  # TODO - push - http://clhs.lisp.se/Body/m_push.htm
+  # TODO - pushnew - http://clhs.lisp.se/Body/m_pshnew.htm
+  # TODO - (n)subst, (n)subst-if, (n)subst-if-not - http://clhs.lisp.se/Body/f_substc.htm
+  # TODO - (n)sublis - http://clhs.lisp.se/Body/f_sublis.htm
+
+  ## Alist stuff
+  # TODO - acons - http://clhs.lisp.se/Body/f_acons.htm
+  # TODO - assoc, assoc-if, assoc-if-not - http://clhs.lisp.se/Body/f_assocc.htm
+  # TODO - pairlis - http://clhs.lisp.se/Body/f_pairli.htm
+  # TODO - rassoc, rassoc-if, rassoc-if-not - http://clhs.lisp.se/Body/f_rassoc.htm
+
+  ## Lists as sets stuff
+  # TODO - adjoin - http://clhs.lisp.se/Body/f_adjoin.htm
+  # TODO - (n)intersection - http://clhs.lisp.se/Body/f_isec_.htm
+  # TODO - (n)set-difference - http://clhs.lisp.se/Body/f_set_di.htm
+  # TODO - (n)set-exclusive-or - http://clhs.lisp.se/Body/f_set_ex.htm
+  # TODO - (n)union - http://clhs.lisp.se/Body/f_unionc.htm
+  # TODO - subsetp - http://clhs.lisp.se/Body/f_subset.htm
+
   class << self
-    def from_array array, initial=true
+    def from_array array
       car, *cdr = array
-      if car.nil?
-        if initial
-          self[nil, nil]
-        else
-          nil
-        end
-      else
-        self[car, from_array(cdr, false)]
+      result = current = Cons.new
+      while car and not car.nil?
+        current.car = car
+        current.cdr = Cons.new if cdr and not cdr.empty?
+        current = current.cdr
+        car, *cdr = cdr
       end
+      result
     end
 
     def [] car=nil, cdr=nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cons
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Christopher Mark Gore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Lisp-style cons cells for Ruby.