Changeset 4074

Timestamp:

Feb 12, 2009, 1:41:08 AM (11 years ago)

Author:

orlov

Message:

• Include Ints function in the List library.

Location:

to-imperative/trunk/java/refal/refal/plus

Files:

• List.rf (modified) (10 diffs)
• List.rfi (modified) (1 diff)

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

@@ -1 +1 @@
 // $Id$
 
-$use Apply Access Arithm Compare;
+$use Apply Access Arithm Compare List2;
 
 $func Deparen_Term term = expr;
@@ -15 +15 @@
 
 Append (e1) e2 = e2 e1;
+
+Ints s.start s.end = <List2.Ints s.start s.end>;
 
 EqTerms t1 t1;
@@ -40 +42 @@
   () e.list $iter {
     e.list : t.item e.rest =
-      (e.new_list <Apply s.Fname e.Fargs t.item>) e.rest;
+      (e.new_list <Apply.Apply s.Fname e.Fargs t.item>) e.rest;
   } :: (e.new_list) e.list,
   e.list : /*empty*/ =
@@ -48 +50 @@
   () e.list $iter {
     e.list : (e.item) e.rest =
-      (e.new_list (<Apply s.Fname e.Fargs e.item>)) e.rest;
+      (e.new_list (<Apply.Apply s.Fname e.Fargs e.item>)) e.rest;
   } :: (e.new_list) e.list,
   e.list : /*empty*/ =
@@ -56 +58 @@
   () e.list $iter {
     e.list : t.item e.rest, {
-      <Apply s.Fname e.Fargs t.item> : e =
+      <Apply.Apply s.Fname e.Fargs t.item> : e =
         (e.new_list t.item) e.rest;
       (e.new_list) e.rest;
@@ -67 +69 @@
   () () e.list $iter {
     e.list : t.item e.rest, {
-      <Apply s.Fname e.Fargs t.item> : e =
+      <Apply.Apply s.Fname e.Fargs t.item> : e =
         (e.true_list t.item) (e.false_list) e.rest;
       (e.true_list) (e.false_list t.item) e.rest;
@@ -81 +83 @@
   (e.value) e.list $iter {
     e.list : e.something t.last =
-      (<Apply s.Fname e.Fargs t.last e.value>) e.something;
+      (<Apply.Apply s.Fname e.Fargs t.last e.value>) e.something;
   } :: (e.value) e.list,
   e.list : /*empty*/ =
@@ -95 +97 @@
   e.list $iter {
     e.list : t.item e.rest =
-      <Apply s.Fname e.Fargs t.item> : e,
+      <Apply.Apply s.Fname e.Fargs t.item> : e,
       e.rest;
   } :: e.list,
@@ -103 +105 @@
   e.list $iter {
     e.list : t.item e.rest =
-      # \{ <Apply s.Fname e.Fargs t.item> : e; },
+      # \{ <Apply.Apply s.Fname e.Fargs t.item> : e; },
       e.rest;
   } :: e.list,
@@ -190 +192 @@
   (e.left) (e.right) $iter {
     e.left : t.l e.left_rest, e.right : t.r e.right_rest = {
-      <Apply s.cmpTerms t.l t.r> : '<' = (e.left_rest) (e.right) e.merged t.l;
+      <Apply.Apply s.cmpTerms t.l t.r> : '<' = (e.left_rest) (e.right) e.merged t.l;
       = (e.left) (e.right_rest) e.merged t.r;
     };

to-imperative/trunk/java/refal/refal/plus/List.rfi

@@ -5 +5 @@
 $func Id e.expr = e.expr;
 
+$func Append (e.expr1) e.expr2 = e.expr2expr1;
+
+$func Ints s.start s.end = e.list;
+
 $func? EqTerms t1 t2 = ;
 
 $func CompareTerms t1 t2 = s.Lt_or_Eq_or_Gt;
-
-$func Append (e.expr1) e.expr2 = e.expr2expr1;
 
 $func Zip (e.list1) (e.list2) = e.list;