Changeset 1113c9e in mainline for uspace/dist/src/sysel/lib/list.sy

Timestamp:

2010-06-09T19:03:24Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8eec3c8

Parents:

8f80c77 (diff), c5cb943d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jsvoboda/helenos/sysel.

File:

• uspace/dist/src/sysel/lib/list.sy (modified) (3 diffs)

uspace/dist/src/sysel/lib/list.sy

@@ -28 +28 @@
 
 -- Doubly-linked list.
-class List/t is
+class List/t : IEnumerable/t is
         var head : ListNode/t;
 
@@ -59 +59 @@
         prop First : ListNode/t is
                 get is
-                    return get_first();
+                        return get_first();
                 end
+        end
+
+        -- Return first node in the list or @c nil if there is none.
+        fun GetEnumerator() : IEnumerator/t is
+                return new ListEnumerator/t(get_first());
         end
 
@@ -131 +136 @@
                 end
         end
+end
 
+class ListEnumerator/t : IEnumerator/t is
+        var first : ListNode/t;
+        var current : ListNode/t;
+        var started : bool;
+
+        new(first_node : ListNode/t) is
+                first = first_node;
+                current = nil;
+                started = false;
+        end
+
+        fun MoveNext() : bool is
+                if started then
+                        current = current.Next;
+                else
+                        current = first;
+                        started = true;
+                end
+
+                return current != nil;
+        end
+
+        prop Data : t is
+                get is
+                        return current.Data;
+                end
+        end
 end