Changeset c5cb943d in mainline for uspace/dist/src/sysel/lib

Timestamp:

2010-06-09T19:01:08Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1113c9e

Parents:

051bc69a

Message:

Update SBI to rev. 291.

Location:

uspace/dist/src/sysel/lib

Files:

• arith.sy (modified) (1 diff)
• boxed.sy (modified) (1 diff)
• ienum.sy (added)
• libflist (modified) (1 diff)
• list.sy (modified) (3 diffs)
• map.sy (modified) (2 diffs)

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

@@ -29 +29 @@
 class Arith is
         -- Return factorial of n.
-        fun Factorial(n : int) : int is
+        fun Factorial(n : int) : int, static is
                 var i : int;
                 var val : int;

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

@@ -38 +38 @@
 class Char is
         var Value : char;
+
+        fun get_as_string() : string, builtin;
+
+        -- String representation.
+        prop AsString : string is
+                get is
+                        return get_as_string();
+                end
+        end
 end
 
 class Int is
         var Value : int;
+
+        fun get_as_string() : string, builtin;
+
+        -- String representation.
+        prop AsString : string is
+                get is
+                        return get_as_string();
+                end
+        end
 end
 

uspace/dist/src/sysel/lib/libflist

@@ -1 +1 @@
 arith.sy
 boxed.sy
+ienum.sy
 list.sy
 map.sy

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

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

@@ -91 +91 @@
                 end
         end
+
+        fun GetEnumerator() : IEnumerator/tkey is
+                return new MapEnumerator/tkey/tvalue(data.get_first());
+        end
 end
 
@@ -97 +101 @@
         var Value : tvalue;
 end
+
+class MapEnumerator/tkey/tvalue : IEnumerator/tkey is
+        var first : ListNode/(MapPair/tkey/tvalue);
+        var current : ListNode/(MapPair/tkey/tvalue);
+        var started : bool;
+
+        new(first_node : ListNode/(MapPair/tkey/tvalue)) 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 : tkey is
+                get is
+                        return current.Data.Key;
+                end
+        end
+end