Changeset 3964 for to-imperative/trunk/java/refal/refal/plus/Stream.rf

Timestamp:

Oct 9, 2008, 9:57:49 PM (12 years ago)

Author:

yura

Message:

• Library extentions (after hdd errors).

File:

• to-imperative/trunk/java/refal/refal/plus/Stream.rf (modified) (2 diffs)

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

@@ -143 +143 @@
 //** $func Get-While stream s.pred = expr;
 
-Get_While stream s.pred, {
+Get_While stream s.pred e.predArgs, {
   <Get stream> : (e.buf) (s.func e.args) =
     (/*e.str*/) (e.buf) $iter {
-      e.buf : t1 e2, {
-        <Apply s.pred t1> : e = (e.str t1) (e2);
-        (e.str) (e.buf) Stop;
-      };
-      (e.str) (<Apply s.func e.args>);
-      (e.str) (e.buf) Stop;
+      e.buf : e.head t1 e.tail, # \{ <Apply s.pred e.predArgs t1> : e; } = (e.str e.head) (t1 e.tail) Stop; 
+      (e.str e.buf) (<Apply s.func e.args>);
+      (e.str e.buf) () Stop;
     } :: (e.str) (e.buf) e.Isstop,
     e.Isstop : Stop =
@@ -159 +156 @@
 };
 
+Get_Until stream s.pred e.predArgs, {
+  <Get stream> : (e.buf) (s.func e.args) =
+    (/*e.str*/) (e.buf) $iter {
+      e.buf : e.head t1 e.tail, <Apply s.pred e.predArgs t1> : e = (e.str e.head) (t1 e.tail) Stop; 
+      (e.str e.buf) (<Apply s.func e.args>);
+      (e.str e.buf) () Stop;
+    } :: (e.str) (e.buf) e.Isstop,
+    e.Isstop : Stop =
+    <Store stream (e.buf) (s.func e.args)>,
+    e.str;
+  <Lib_Error (Stream "Get_Until") "Arg 1 is not a Stream"> = $fail;
+};
 
 //** $func? End-of-Stream? stream = ;