Changeset 2027 for to-imperative/trunk/library/Stream/refal/Stream.rf

Timestamp:

Jul 17, 2006, 9:40:42 PM (15 years ago)

Author:

orlov

Message:

• Stream.Get-Line and StdIO.Read-Line! consider a line to be terminated

by any one of a line feed ('\n'), a carriage return ('\r'),
or a carriage return followed immediately by a linefeed.

• New function Stream.Scanc.

File:

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

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

@@ -87 +87 @@
 
 
+*** $func  Scanc  stream t1   = empty-or-t1;
+
+Scanc stream t1, {
+  <Getc stream> : {
+    t1 = t1;
+    t2 = <Ungets stream t2>;
+  };
+  /*empty*/;
+};
+
+
 *** $func Get-Delim stream t.delim = expr;
 
@@ -106 +117 @@
 *** $func Get-Line stream = expr;
 
-Get-Line stream = <Get-Delim stream '\n'>;
+//Get-Line stream = <Get-Delim stream '\n'>;
+
+$func? Not-EOL t1 = ;
+Not-EOL t1 = # t1 : \{ '\n'; '\r'; };
+
+Get-Line stream =
+  <Get-While stream &Not-EOL> <Scanc stream '\r'> <Scanc stream '\n'>;