lazylist 0.2.1 → 0.2.2

data/CHANGES

@@ -1,3 +1,5 @@
+2005-12-23 * 0.2.2 * Added append and + (the binary append case) to append lazy
+                     lists to each other.
 2005-12-05 * 0.2.1 * Fixed a documentation bug, reported by Gary Wright
                      <at2002@mac.com>.
                    * enable/disable index reference cache added.

data/TODO

@@ -1,36 +1,2 @@
 * adding better support for finite lazy lists  
 * make lists even
-* this stuff
-  # XXX
-  def append(*elements)
-    return rest if empty?
-    s = self
-    loop do
-      if s.tail.empty?
-        break s
-      else
-        s = s.tail
-      end
-    end
-    s.tail = rest
-    self
-  end
-  alias << append
-
-  # XXX self should be finite
-  def +(other)
-    other.is_a? self.class or
-      raise TypeError, "other has to be a #{self.class}"
-    copy = LazyList[to_a]
-    s = copy
-    loop do
-      if s.tail.empty?
-        break s
-      else
-        s = s.tail
-      end
-    end
-    s.tail = LazyList[other.to_a]
-    copy
-  end
-

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/lazylist.rb

@@ -501,6 +501,24 @@ class LazyList
     end
   end
 
+  # Append this lazy list to the _*other_ lists, creating a new lists that
+  # consists of the elements of this list and the elements of the lists other1,
+  # other2, ... If any of the lists is infinite, the elements of the following
+  # lists will never occur in the result list.
+  def append(*other)
+    if empty?
+      if other.empty?
+        Empty
+      else
+        other.first.append(*other[1..-1])
+      end
+    else
+      list(head) { tail.append(*other) }
+    end
+  end
+
+  alias + append
+
   # Takes the next n elements and returns them as an array.
   def take(n = 1)
     result = []

data/tests/test.rb

@@ -17,6 +17,8 @@ class MyEnum
 end
 
 class TC_LazyList < Test::Unit::TestCase
+  Empty = LazyList::Empty
+
   def setup
     @strings = LazyList.tabulate("a")
     @natural = LazyList.tabulate(1)
@@ -37,7 +39,7 @@ class TC_LazyList < Test::Unit::TestCase
   end
 
   def test_constructor
-    ll1 = LazyList.new(:foo, LazyList::Empty)
+    ll1 = LazyList.new(:foo, Empty)
     assert(!ll1.empty?)
     ll2 = LazyList.new(:foo) { Empty }
     assert(!ll2.empty?)
@@ -114,9 +116,9 @@ class TC_LazyList < Test::Unit::TestCase
   end
 
   def test_index
-    assert_equal nil, LazyList::Empty[-1]
-    assert_equal nil, LazyList::Empty[0]
-    assert_equal nil, LazyList::Empty[1]
+    assert_equal nil, Empty[-1]
+    assert_equal nil, Empty[0]
+    assert_equal nil, Empty[1]
     assert @natural.cached?
     assert_equal nil, @natural[-1] 
     assert_equal nil, @natural[-1] 
@@ -138,10 +140,10 @@ class TC_LazyList < Test::Unit::TestCase
   end
 
   def test_index_without_cache
-    LazyList::Empty.cached = false
-    assert_equal nil, LazyList::Empty[-1]
-    assert_equal nil, LazyList::Empty[0]
-    assert_equal nil, LazyList::Empty[1]
+    Empty.cached = false
+    assert_equal nil, Empty[-1]
+    assert_equal nil, Empty[0]
+    assert_equal nil, Empty[1]
     @natural.cached = false
     assert !@natural.cached?
     assert_equal nil, @natural[-1] 
@@ -222,10 +224,10 @@ class TC_LazyList < Test::Unit::TestCase
   end
 
   def test_construct_ref
-    assert_equal LazyList::Empty, LazyList[0, -1]
+    assert_equal Empty, LazyList[0, -1]
     assert_equal [0], LazyList[0, 1].to_a
     assert_equal (0..9).to_a, LazyList[0, 10].to_a
-    assert_equal LazyList::Empty, LazyList[0..-1]
+    assert_equal Empty, LazyList[0..-1]
     assert_equal [0], LazyList[0..0].to_a
     assert_equal (0..9).to_a, LazyList[0..9].to_a
   end
@@ -246,7 +248,7 @@ class TC_LazyList < Test::Unit::TestCase
 
   def test_inspect
     l = LazyList[1..11]
-    assert_equal "[]", LazyList::Empty.inspect 
+    assert_equal "[]", Empty.inspect 
     assert_equal "[1,... ]", l.inspect 
     l[1]
     assert_equal "[1, 2,... ]", l.inspect 
@@ -273,11 +275,11 @@ class TC_LazyList < Test::Unit::TestCase
   end
 
   def test_list
-    assert_equal LazyList::Empty, list
+    assert_equal Empty, list
     assert_equal [], list.to_a
-    assert_equal LazyList.new(1) { LazyList::Empty }, list(1)
+    assert_equal LazyList.new(1) { Empty }, list(1)
     assert_equal [1], list(1).to_a
-    assert_equal LazyList::Empty, list
+    assert_equal Empty, list
     o = odd
     assert_equal [1, 3, 5, 7, 9, 11, 13, 15, 17, 19], o.take(10)
     assert_equal @odd.take(10), o.take(10)
@@ -289,8 +291,8 @@ class TC_LazyList < Test::Unit::TestCase
   end
 
   def test_sublist
-    assert_equal LazyList::Empty, @natural.sublist(-1)
-    assert_equal LazyList::Empty, @natural.sublist(0)
+    assert_equal Empty, @natural.sublist(-1)
+    assert_equal Empty, @natural.sublist(0)
     assert_equal [1], @natural.sublist(1).to_a
     assert_equal (1..10).to_a, @natural.sublist(10).to_a
     assert_equal (6..15).to_a, @natural[5, 10].to_a
@@ -299,5 +301,28 @@ class TC_LazyList < Test::Unit::TestCase
     assert_equal nil, @natural.sublist(10)[10]
     assert_equal 10, @natural.sublist(10)[9]
   end
+
+  def test_append
+    l1 = LazyList[1..3]
+    l2 = LazyList[5..7]
+    l3 = @natural.drop(8)
+    assert_equal [], Empty.append.to_a
+    assert_equal [], Empty.append(Empty).to_a
+    assert_equal [], (Empty + Empty).to_a
+    assert_equal [], Empty.append(Empty, Empty).to_a
+    assert_equal [1, 2, 3], Empty.append(Empty, l1).to_a
+    assert_equal [1, 2, 3], Empty.append(l1, Empty).to_a
+    assert_equal [1, 2, 3], Empty.append(Empty, l1, Empty).to_a
+    assert_equal [5, 6, 7, 1, 2, 3], l2.append(Empty, l1, Empty).to_a
+    assert_equal [1, 2, 3], l1.append.to_a
+    assert_equal [1, 2, 3], (l1 + Empty).to_a
+    assert_equal [1, 2, 3], (Empty + l1).to_a
+    assert_equal [1, 2, 3, 5, 6, 7], l1.append(l2).to_a
+    assert_equal [1, 2, 3, 5, 6, 7], (l1 + l2).to_a
+    assert_equal [1, 2, 3], l1.append(Empty).to_a
+    assert_equal [1, 2, 3], Empty.append(l1).to_a
+    assert_equal [1, 2, 3] + [5, 6, 7] + [9, 10, 11, 12],
+      l1.append(l2, l3).take(10)
+  end
 end
   # vim: set et sw=2 ts=2: 

metadata

@@ -3,65 +3,62 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: lazylist
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2005-12-22 00:00:00 +01:00
+  version: 0.2.2
+date: 2005-12-23 00:00:00 +01:00
 summary: Implementation of lazy lists for Ruby
 require_paths: 
-- lib
+  - lib
 email: flori@ping.de
 homepage: http://lazylist.rubyforge.org
 rubyforge_project: lazylist
-description: ""
+description: ''
 autorequire: lazylist
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
+    - 
+      - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-- Florian Frank
+  - Florian Frank
 files: 
-- examples
-- install.rb
-- GPL
-- TODO
-- Rakefile
-- VERSION
-- tests
-- CHANGES
-- lib
-- make_doc.rb
-- README.en
-- examples/hamming.rb
-- examples/sieve.rb
-- examples/pi.rb
-- examples/examples.rb
-- tests/test.rb
-- tests/test_enumerable.rb
-- tests/runner.rb
-- lib/lazylist.rb
+  - examples
+  - install.rb
+  - GPL
+  - TODO
+  - Rakefile
+  - VERSION
+  - tests
+  - CHANGES
+  - lib
+  - make_doc.rb
+  - README.en
+  - examples/hamming.rb
+  - examples/sieve.rb
+  - examples/pi.rb
+  - examples/examples.rb
+  - tests/test.rb
+  - tests/test_enumerable.rb
+  - tests/runner.rb
+  - lib/lazylist.rb
 test_files: 
-- tests/test.rb
+  - tests/test.rb
 rdoc_options: 
-- --title
-- LazyList -- Infinite lists in Ruby
-- --main
-- LazyList
-- --line-numbers
+  - "--title"
+  - "LazyList -- Infinite lists in Ruby"
+  - "--main"
+  - LazyList
+  - "--line-numbers"
 extra_rdoc_files: 
-- lib/lazylist.rb
+  - lib/lazylist.rb
 executables: []
-
 extensions: []
-
 requirements: []
-
-dependencies: []
-
+dependencies: []