Changeset 2063

Timestamp:

Aug 24, 2006, 8:35:55 PM (14 years ago)

Author:

orlov

Message:

• New functions Id and Append, and Map!.
• Functions Map and Map! are $fail-able.

Location:

to-imperative/trunk/library/List/refal

Files:

• List.rf (modified) (4 diffs)
• List.rfi (modified) (3 diffs)

to-imperative/trunk/library/List/refal/List.rf

@@ -14 +14 @@
 Paren-Term term = (term);
 
+Id e1 = e1;
+
+Append (e1) e2 = e2 e1;
+
 Zip (e.list1) (e.list2) =
   (e.list1) (e.list2) /*empty*/ $iter {
@@ -27 +31 @@
     e.list : t.item e.rest =
       (e.new-list <Apply s.Fname e.Fargs t.item>) e.rest;
+  } :: (e.new-list) e.list,
+  e.list : /*empty*/ =
+  e.new-list;
+
+Map! s.Fname e.Fargs (e.list) =
+  () e.list $iter {
+    e.list : (e.item) e.rest =
+      (e.new-list (<Apply s.Fname e.Fargs e.item>)) e.rest;
   } :: (e.new-list) e.list,
   e.list : /*empty*/ =
@@ -55 +67 @@
 Elem? e.list t.item =
   e.list : e t.item e;
-
-Get-Elem s.num (e.list) = <L s.num e.list>;
 
 Foldr s.Fname e.Fargs (e.value) (e.list) =
@@ -113 +123 @@
  * Returns number of e.expr entries in e.source and e.source without all e.expr's.
  */
-Entries e.expr (e.source) =
-  0 e.source () $iter {
-    e.source : e1 e.expr e2 = <"+" s.num 1> e2 (e.res e1);
-    s.num (e.res e.source);
-  } :: s.num e.source (e.res),
-  e.source : /*empty*/ =
-  s.num e.res;
+//Entries e.expr (e.source) =
+//  0 e.source () $iter {
+//    e.source : e1 e.expr e2 = <"+" s.num 1> e2 (e.res e1);
+//    s.num (e.res e.source);
+//  } :: s.num e.source (e.res),
+//  e.source : /*empty*/ =
+//  s.num e.res;
 
 /*

to-imperative/trunk/library/List/refal/List.rfi

@@ -3 +3 @@
 // $Date$
 
+$func Id e1 = e1;
+
+$func Append (e1) e2 = e2e1;
+
 $func Zip (e.list1) (e.list2) = e.new-list;
 
-$func Map s.Fname e.Fargs (e.list) = e.new-list;
+$func? Map s.Fname e.Fargs (e.list) = e.new-list;
+
+$func? Map! s.Fname e.Fargs (e.list) = e.new-list;
 
 $func Filter s.Fname e.Fargs (e.list) = e.new-list;
@@ -12 +18 @@
 
 $func? Elem? e.list t.item = ;
-
-$func Get-Elem s.num (e.list) = term;
 
 $func Foldr s.Fname e.Fargs (e.value) (e.list) = e.value;
@@ -32 +36 @@
 
 // Returns number of e.expr entries in e.source and e.source without all e.expr's.
-$func Entries e.expr (e.source) = s.num e.res;
+// FIXME: Strange function!
+// Additionally it conflicts with Table.Entries.
+// Commented out at least until there is some sort of name conflicts resolution
+// strategy.
+// $func Entries e.expr (e.source) = s.num e.res;
 
 // Add to the first list all new elements from the second one.