Some changes based on feedback.

[pforth] / fth / file.fth

diff --git a/fth/file.fth b/fth/file.fth
index 678a991..bc81f3a 100644 (file)
--- a/fth/file.fth
+++ b/fth/file.fth
@@ -1,43 +1,49 @@
 \ READ-LINE and WRITE-LINE
 \
 \ READ-LINE and WRITE-LINE
 \

-\ This file is in the public domain.
+\ This code is part of pForth.

 \
 \

+\ The pForth software code is dedicated to the public domain,
+\ and any third party may reproduce, distribute and modify
+\ the pForth software code or any derivative works thereof
+\ without any compensation or license.  The pForth software
+\ code is provided on an "as is" basis without any warranty
+\ of any kind, including, without limitation, the implied
+\ warranties of merchantability and fitness for a particular
+\ purpose and their equivalents under the laws of any jurisdiction.

 
 private{
 
 
 private{
 

-10 constant \n
-13 constant \r
+10 constant \N
+13 constant \R

 
 \ Unread one char from file FILEID.
 
 \ Unread one char from file FILEID.

-: UNREAD ( fileid -- ior )
-    { f }
-    f file-position          ( ud ior )
+: UNREAD { fileid -- ior }
+    fileid file-position          ( ud ior )

     ?dup
     IF   nip nip \ IO error
     ?dup
     IF   nip nip \ IO error

-    ELSE 1 s>d d- f reposition-file
+    ELSE 1 s>d d- fileid reposition-file

     THEN
 ;
 
 \ Read the next available char from file FILEID and if it is a \n then
 \ skip it; otherwise unread it.  IOR is non-zero if an error occured.
     THEN
 ;
 
 \ Read the next available char from file FILEID and if it is a \n then
 \ skip it; otherwise unread it.  IOR is non-zero if an error occured.

-\ C-ADDR is a buffer that can hold at least on char.
-: SKIP-\n ( c-addr fileid -- ior )
-  { a f }
-  a 1 f read-file               ( u ior )
-  ?dup
-  IF \ Read error?
-      nip
-  ELSE                          ( u )
-      0=
-      IF \ End of file?
-          0
-      ELSE
-          a c@ \n =             ( is-it-a-\n? )
-          IF   0
-          ELSE f unread
-          THEN
-      THEN
-  THEN
+\ C-ADDR is a buffer that can hold at least one char.
+: SKIP-\N { c-addr fileid -- ior }
+    c-addr 1 fileid read-file     ( u ior )
+    ?dup
+    IF \ Read error?
+        nip
+    ELSE                          ( u )
+        0=
+        IF \ End of file?
+            0
+        ELSE
+            c-addr c@ \n =        ( is-it-a-\n? )
+            IF   0
+            ELSE fileid unread
+            THEN
+        THEN
+    THEN

 ;
 
 \ This is just s\" \n" but s\" isn't yet available.
 ;
 
 \ This is just s\" \n" but s\" isn't yet available.


@@ -46,38 +52,37 @@ create (LINE-TERMINATOR) \n c,
 
 }private
 
 
 }private
 

-

 \ This treats \n, \r\n, and \r as line terminator.  Reading is done
 \ one char at a time with READ-FILE hence READ-FILE should probably do
 \ some form of buffering for good efficiency.
 : READ-LINE ( c-addr u1 fileid -- u2 flag ior )
 \ This treats \n, \r\n, and \r as line terminator.  Reading is done
 \ one char at a time with READ-FILE hence READ-FILE should probably do
 \ some form of buffering for good efficiency.
 : READ-LINE ( c-addr u1 fileid -- u2 flag ior )

-  { a u f }
-  u 0 ?DO
-      a i chars + 1 f read-file                                  ( u ior' )
-      ?dup IF nip i false rot UNLOOP EXIT THEN \ Read error?     ( u )
-      0= IF i i 0> 0 UNLOOP EXIT THEN          \ End of file?    ( )
-      a i chars + c@
-      CASE
-          \n OF i true 0 UNLOOP EXIT ENDOF
-          \r OF
-              \ Detect \r\n
-              a i 1+ chars + f skip-\n                           ( ior )
-              ?dup IF i false rot UNLOOP EXIT THEN \ IO Error?   ( )
-              i true 0 UNLOOP EXIT
-         ENDOF
-      ENDCASE
-  LOOP
-  \ Line doesn't fit in buffer
-  u true 0
+    { a u f }
+    u 0 ?DO
+        a i chars + 1 f read-file                                  ( u ior' )
+        ?dup IF nip i false rot UNLOOP EXIT THEN \ Read error?     ( u )
+        0= IF i i 0<> 0 UNLOOP EXIT THEN         \ End of file?    ( )
+        a i chars + c@
+        CASE
+            \n OF i true 0 UNLOOP EXIT ENDOF
+            \r OF
+                \ Detect \r\n
+                a i chars + f skip-\n                              ( ior )
+                ?dup IF i false rot UNLOOP EXIT THEN \ IO Error?   ( )
+                i true 0 UNLOOP EXIT
+           ENDOF
+        ENDCASE
+    LOOP
+    \ Line doesn't fit in buffer
+    u true 0

 ;
 
 : WRITE-LINE ( c-addr u fileid -- ior )
 ;
 
 : WRITE-LINE ( c-addr u fileid -- ior )

-  { f }
-  f write-file                  ( ior )
-  ?dup
-  IF \ IO error
-  ELSE line-terminator f write-file
-  THEN
+    { f }
+    f write-file                  ( ior )
+    ?dup
+    IF \ IO error
+    ELSE line-terminator f write-file
+    THEN

 ;
 
 privatize
 ;
 
 privatize