Changeset 4030

Timestamp:

Nov 11, 2008, 7:37:57 PM (12 years ago)

Author:

yura

Message:

• DirectProduct?.

File:

• to-imperative/trunk/java/refal/refal/plus/List2.rf (modified) (1 diff)

to-imperative/trunk/java/refal/refal/plus/List2.rf

@@ -168 +168 @@
   };
 
-$public $func Products e.lists = e.lists;
-Products {
-  /* empty */ = /* empty */;
-  (e.list) = <Map &Paren e.list>;
-  (e.list) e.lists = <Product (e.list) (<Products e.lists>)>;
+$public $func DirectProduct e.lists = e.lists;
+DirectProduct e.lists = <DirectProductWith &Paren e.lists>;
+
+$func? DirectProductWithHelp t.func e.lists t.term = e.lists;
+DirectProductWithHelp t.func e.lists t.term = <DirectProductWith (t.func t.term) e.lists>;
+
+$public $func? DirectProductWith t.func e.lists = e.lists;
+DirectProductWith t.func e.lists = e.lists : {
+  /* empty */ = <Apply t.func>;
+  (e.list) e.tail = <Map (&DirectProductWithHelp t.func e.tail) e.list>;
 }; 
-
-$func? DirectProductWithHelp s.box t.func (e.args) e.lists = ;
-DirectProductWithHelp s.box t.func (e.args) e.lists = e.lists : {
-  /* empty */ = <Put s.box <Apply t.func e.args>>;
-  (e.head) e.tail =
-    { 
-      e.head : e t.term e, 
-        <DirectProductWithHelp s.box t.func (e.args t.term) e.tail>,
-        $fail;;
-    };
-};
-
-$public $func? DirectProductWith t.func e.lists = e.list;
-DirectProductWith t.func e.lists = {
-  e.lists : /* empty */ = /* empty */;
-  = <Box> :: s.box, <DirectProductWithHelp s.box t.func () e.lists>, <Get s.box>;
-};
 
 $public $func? IsElem e.list t.item = ;