tests.sh: soso are always detected as failed tests

[nit.git] / lib / standard / collection / range.nit

diff --git a/lib/standard/collection/range.nit b/lib/standard/collection/range.nit
index f356c6f..e72771e 100644 (file)
--- a/lib/standard/collection/range.nit
+++ b/lib/standard/collection/range.nit
@@ -19,17 +19,17 @@ import abstract_collection
 class Range[E: Discrete]
        super Collection[E]
 
-       redef readable var _first: E
+       redef var first: E
 
        # Get the last element.
-       readable var _last: E
+       var last: E
 
        # Get the element after the last one.
-       readable var _after: E
+       var after: E
 
-       redef fun has(item) do return item >= _first and item <= _last
+       redef fun has(item) do return item >= first and item <= last
 
-       redef fun has_only(item) do return _first == item and item == _last or is_empty
+       redef fun has_only(item) do return first == item and item == last or is_empty
 
        redef fun count(item)
        do
@@ -42,20 +42,9 @@ class Range[E: Discrete]
 
        redef fun iterator do return new IteratorRange[E](self)
 
-       redef fun iterate
-               !each(e: E)
-       do
-               var c = _first
-               var l = _last
-               while c <= l do
-                       each(c)
-                       c = c.succ
-               end
-       end
-
        redef fun length
        do
-               var nb = _first.distance(_after)
+               var nb = first.distance(after)
                if nb > 0 then
                        return nb
                else
@@ -63,36 +52,37 @@ class Range[E: Discrete]
                end
        end
 
-       redef fun is_empty do return _first >= _after
+       redef fun is_empty do return first >= after
 
        # Create a range [`from`, `to`].
        # The syntax `[from..to[` is equivalent.
        init(from: E, to: E)
        do
-               _first = from
-               _last = to
-               _after = to.succ
+               first = from
+               last = to
+               after = to.successor(1)
        end
 
        # Create a range [`from`, `to`[.
        # The syntax `[from..to[` is equivalent.
        init without_last(from: E, to: E)
        do
-               _first = from
-               _last = to.prec
-               _after = to
+               first = from
+               last = to.predecessor(1)
+               after = to
        end
 end
 
-class IteratorRange[E: Discrete]
+private class IteratorRange[E: Discrete]
        # Iterator on ranges.
        super Iterator[E]
        var _range: Range[E]
-       redef readable var _item: E
+       var _item: E
+       redef fun item do return _item
 
        redef fun is_ok do return _item < _range.after
        
-       redef fun next do _item = _item.succ
+       redef fun next do _item = _item.successor(1)
        
        init(r: Range[E])
        do
@@ -100,3 +90,16 @@ class IteratorRange[E: Discrete]
                _item = r.first
        end
 end
+
+redef class Int
+       # Returns the range from 0 to `self-1`, is used to do:
+       #
+       #    var s = new Array[String]
+       #    for i in 3.times do s.add "cool"
+       #    assert s.join(" ") == "cool cool cool"
+       #
+       #    s.clear
+       #    for i in 10.times do s.add(i.to_s)
+       #    assert s.to_s == "0123456789"
+       fun times: Range[Int] do return [0 .. self[
+end